[jboss-cvs] JBossAS SVN: r90597 - trunk/testsuite.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jun 25 12:24:46 EDT 2009
Author: pgier
Date: 2009-06-25 12:24:45 -0400 (Thu, 25 Jun 2009)
New Revision: 90597
Modified:
trunk/testsuite/build.xml
Log:
[JBBUILD-531] Make sure references get passed through antcall
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-06-25 15:03:20 UTC (rev 90596)
+++ trunk/testsuite/build.xml 2009-06-25 16:24:45 UTC (rev 90597)
@@ -116,7 +116,7 @@
&modules;
- <target name="init-paths" depends="init-dependencies"
+ <target name="init-paths" depends="init-dependencies" unless="init-paths.target.complete"
description="initialize the classpath refs">
<!-- The combined library classpath -->
@@ -303,6 +303,7 @@
<path refid="tests.compile.classpath"/>
</path>
+ <property name="init-paths.target.complete" value="true"/>
</target>
<!-- RMI Stub generation -->
@@ -368,16 +369,16 @@
<propertyref prefix="jbosstest."/>
</propertyset>
- <target name="init-maven-ant-tasks" unless="maven.ant.tasks.initialized">
+ <target name="init-maven-ant-tasks" unless="init-maven-ant-tasks.target.complete">
<path id="maven-ant-tasks.classpath" path="../tools/maven/ant-tasks/maven-ant-tasks-2.1.0-SNAPSHOT.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath" />
- <property name="maven.ant.tasks.initialized" value="true"/>
+ <property name="init-maven-ant-tasks.target.complete" value="true"/>
</target>
- <target name="init-dependencies" depends="init-maven-ant-tasks">
+ <target name="init-dependencies" depends="init-maven-ant-tasks" unless="init-dependencies.target.complete">
<!-- ================================================================== -->
<!-- Init the maven ant tasks -->
<!-- ================================================================== -->
@@ -406,9 +407,10 @@
version="${component-matrix.project.properties.version.jboss.jaxr}" type="sar"/>
</maven:dependencies>
+ <property name="init-dependencies.target.complete" value="true"/>
</target>
- <target name="init" depends="init-paths">
+ <target name="init" depends="init-paths" unless="init.target.complete">
<record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
<mkdir dir="${build.gen-src}/org/jboss/test/cts/ejb"/>
<mkdir dir="${build.gen-src}/org/jboss/test/cts/interfaces"/>
@@ -427,6 +429,8 @@
<mkdir dir="${build.gen-src}/org/jboss/test/classloader/scoping/singleton"/>
<copy tofile="${build.gen-src}/org/jboss/test/classloader/scoping/singleton/MySingleton.java"
file="${source.java}/org/jboss/test/classloader/scoping/singleton/MySingleton_V1.txt" overwrite="false"/>
+
+ <property name="init.target.complete" value="true"/>
</target>
<!-- retrieve items from the repository, store them in the -->
@@ -1012,42 +1016,42 @@
depends="maybejars">
<record name="${basedir}/output/tests.log" append="no" action="start" loglevel="info"/>
<property name="nojars" value="true"/>
- <antcall target="jboss-minimal-tests" />
- <antcall target="jboss-all-config-tests"/>
- <antcall target="tests-profileservice"/>
- <antcall target="tests-bootstrap-dependencies"/>
- <antcall target="tests-springdeployer"/>
+ <antcall target="jboss-minimal-tests" inheritRefs="true"/>
+ <antcall target="jboss-all-config-tests" inheritRefs="true"/>
+ <antcall target="tests-profileservice" inheritRefs="true"/>
+ <antcall target="tests-bootstrap-dependencies" inheritRefs="true"/>
+ <antcall target="tests-springdeployer" inheritRefs="true"/>
- <antcall target="tests-security-manager"/>
+ <antcall target="tests-security-manager" inheritRefs="true"/>
- <antcall target="tests-clustering-all-stacks"/>
- <antcall target="tomcat-ssl-tests"/>
- <antcall target="tomcat-sso-tests"/>
- <antcall target="tomcat-sso-clustered-tests"/>
- <antcall target="tomcat-webctx-tests"/>
- <antcall target="tomcat-federation-tests"/>
- <antcall target="tests-binding-manager"/>
- <antcall target="tests-jacc-security"/>
- <antcall target="tests-jacc-securitymgr"/>
- <antcall target="tests-jacc-security-allstarrole"/>
+ <antcall target="tests-clustering-all-stacks" inheritRefs="true"/>
+ <antcall target="tomcat-ssl-tests" inheritRefs="true"/>
+ <antcall target="tomcat-sso-tests" inheritRefs="true"/>
+ <antcall target="tomcat-sso-clustered-tests" inheritRefs="true"/>
+ <antcall target="tomcat-webctx-tests" inheritRefs="true"/>
+ <antcall target="tomcat-federation-tests" inheritRefs="true"/>
+ <antcall target="tests-binding-manager" inheritRefs="true"/>
+ <antcall target="tests-jacc-security" inheritRefs="true"/>
+ <antcall target="tests-jacc-securitymgr" inheritRefs="true"/>
+ <antcall target="tests-jacc-security-allstarrole" inheritRefs="true"/>
<!--
<antcall target="tests-security-jaspi-unit"/>
-->
- <antcall target="tests-jbossmessaging"/>
- <antcall target="tests-jbossmessaging-cluster"/>
- <antcall target="tests-compatibility"/>
- <antcall target="tests-aop-scoped"/>
- <antcall target="jrmp-invoker-tests"/>
- <antcall target="pooled-invoker-tests"/>
- <antcall target="tests-clustered-profileservice"/>
- <antcall target="tests-web-profile"/>
+ <antcall target="tests-jbossmessaging" inheritRefs="true"/>
+ <antcall target="tests-jbossmessaging-cluster" inheritRefs="true"/>
+ <antcall target="tests-compatibility" inheritRefs="true"/>
+ <antcall target="tests-aop-scoped" inheritRefs="true"/>
+ <antcall target="jrmp-invoker-tests" inheritRefs="true"/>
+ <antcall target="pooled-invoker-tests" inheritRefs="true"/>
+ <antcall target="tests-clustered-profileservice" inheritRefs="true"/>
+ <antcall target="tests-web-profile" inheritRefs="true"/>
<!-- NOTE: Run the classloader leak tests last as they can be
disruptive to the overall run if there are failures. -->
- <antcall target="tests-classloader-leak"/>
- <antcall target="tests-clustered-classloader-leak"/>
+ <antcall target="tests-classloader-leak" inheritRefs="true"/>
+ <antcall target="tests-clustered-classloader-leak" inheritRefs="true"/>
- <antcall target="tests-report"/>
+ <antcall target="tests-report" inheritRefs="true"/>
<!-- JBAS-5918 https://issues.apache.org/bugzilla/show_bug.cgi?id=41368
<record name="${basedir}/output/tests.log" action="stop"/>
-->
@@ -1085,24 +1089,24 @@
<target name="jboss-all-config-tests"
description="The units tests which are run against the jboss all config" depends="init">
<server:start name="all"/>
- <antcall target="tests-standard-unit"/>
- <antcall target="tests-client-unit"/>
- <antcall target="tests-security-basic-unit"/>
- <antcall target="tests-standard-stress"/>
- <antcall target="tests-jbossmx-compliance"/>
- <antcall target="tests-jbossmx-implementation"/>
- <antcall target="tests-jbossmx-performance"/>
- <antcall target="tests-iiop"/>
- <antcall target="tests-scout-jaxr"/>
- <antcall target="tests-webservice" />
- <antcall target="tests-aspects"/>
+ <antcall target="tests-standard-unit" inheritRefs="true"/>
+ <antcall target="tests-client-unit" inheritRefs="true"/>
+ <antcall target="tests-security-basic-unit" inheritRefs="true"/>
+ <antcall target="tests-standard-stress" inheritRefs="true"/>
+ <antcall target="tests-jbossmx-compliance" inheritRefs="true"/>
+ <antcall target="tests-jbossmx-implementation" inheritRefs="true"/>
+ <antcall target="tests-jbossmx-performance" inheritRefs="true"/>
+ <antcall target="tests-iiop" inheritRefs="true"/>
+ <antcall target="tests-scout-jaxr" inheritRefs="true"/>
+ <antcall target="tests-webservice" inheritRefs="true"/>
+ <antcall target="tests-aspects" inheritRefs="true"/>
<server:stop name="all"/>
</target>
<target name="smoke-tests"
description="A basic set of units tests which are run against the jboss all config" depends="init">
<server:start name="all"/>
- <antcall target="smoke-tests-raw"/>
+ <antcall target="smoke-tests-raw" inheritRefs="true"/>
<server:stop name="all"/>
</target>
@@ -1133,7 +1137,7 @@
<target name="tests-web-profile" description="Tests with the web profile">
<server:start name="web"/>
- <antcall target="run-web-profile-unit"/>
+ <antcall target="run-web-profile-unit" inheritRefs="true"/>
<server:stop name="web"/>
</target>
@@ -1219,7 +1223,7 @@
<server:start name="tomcat-sso-cluster0"/>
<server:start name="tomcat-sso-cluster1"/>
- <antcall target="tests-clustering-unit">
+ <antcall target="tests-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="tc-sso-clustered.includes"/>
<param name="jboss-junit-configuration" value="tomcat-sso-cluster"/>
</antcall>
@@ -1528,7 +1532,7 @@
| server distribution build.
-->
- <target name="tests-standard-unit">
+ <target name="tests-standard-unit" depends="init">
<echo><![CDATA[
junit.timeout: ${junit.timeout}
jbosstest.iterationcount: ${jbosstest.iterationcount}
@@ -2829,7 +2833,7 @@
<server:start name="jbm-cluster1"/>
<server:start name="jbm-cluster2"/>
- <antcall target="exec-jbmcluster"/>
+ <antcall target="exec-jbmcluster" inheritRefs="true"/>
<!-- I'm not stopping jbm-cluster2 as this server will be killed during the test -->
<server:stop name="jbm-cluster1"/>
@@ -2914,7 +2918,7 @@
</patternset>
</create-config>
<server:start name="jbossmessaging"/>
- <antcall target="tests-jbossmessaging-unit" />
+ <antcall target="tests-jbossmessaging-unit" inheritRefs="true"/>
<server:stop name="jbossmessaging"/>
</target>
@@ -3476,7 +3480,7 @@
<apache location="${apache.location}" action-type="stop"/>
<!-- Test the default UDP stack -->
- <antcall target="tests-clustering-configure">
+ <antcall target="tests-clustering-configure" inheritRefs="true">
<param name="jboss-junit-configuration" value="udp"/>
</antcall>
<server:start name="cluster-udp-0"/>
@@ -3485,7 +3489,7 @@
<server:stop name="cluster-udp-1"/>
<!-- Test a TCP stack.-->
- <antcall target="tests-clustering-configure">
+ <antcall target="tests-clustering-configure" inheritRefs="true">
<param name="jboss-junit-configuration" value="tcp"/>
</antcall>
<server:start name="cluster-tcp-0"/>
@@ -3494,7 +3498,7 @@
<server:stop name="cluster-tcp-1"/>
<!-- Test the field UDP stack -->
- <antcall target="tests-clustering-field-configure">
+ <antcall target="tests-clustering-field-configure" inheritRefs="true">
<param name="cluster.includes.refid" value="cluster.field.includes"/>
<param name="jboss-junit-configuration" value="udp"/>
<param name="jbosstest.cluster.node0.config" value="cluster-field-udp-0"/>
@@ -3506,7 +3510,7 @@
<server:stop name="cluster-field-udp-0"/>
<server:stop name="cluster-field-udp-1"/>
<!-- Test the field TCP stack -->
- <antcall target="tests-clustering-field-configure">
+ <antcall target="tests-clustering-field-configure" inheritRefs="true">
<param name="cluster.includes.refid" value="cluster.field.includes"/>
<param name="jboss-junit-configuration" value="tcp"/>
<param name="jbosstest.cluster.node0.config" value="cluster-field-tcp-0"/>
@@ -3679,7 +3683,7 @@
<sequential>
<start-jboss conf="default" jvmargs="-Xmx128m -Xmx512m -XX:MaxPermSize=512m @{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
<wait-on-host/>
- <antcall target="tests-standard-unit-matrix-version-pooled">
+ <antcall target="tests-standard-unit-matrix-version-pooled" inheritRefs="true">
<param name="matrix-configuration" value="@{client-version}-@{label}"/>
<param name="junit-jvm-command" value="@{client-jdk}/bin/java"/>
<param name="current-version-dir" value="${matrix-versions}/@{client-version}"/>
@@ -3700,7 +3704,7 @@
<sequential>
<start-jboss conf="default" jvmargs="-Xmx128m -Xmx512m -XX:MaxPermSize=512m @{serialization-flag}" java.exec="@{server-jdk}/bin/java"/>
<wait-on-host/>
- <antcall target="tests-standard-unit-matrix-version">
+ <antcall target="tests-standard-unit-matrix-version" inheritRefs="true">
<param name="matrix-configuration" value="@{client-version}-@{label}"/>
<param name="junit-jvm-command" value="@{client-jdk}/bin/java"/>
<param name="current-version-dir" value="${matrix-versions}/@{client-version}"/>
@@ -3726,7 +3730,7 @@
<attribute name="parameter-filter"/>
<sequential>
<!-- this requires antcall as a property can't be redefined -->
- <antcall target="execute-matrix-unit-target">
+ <antcall target="execute-matrix-unit-target" inheritRefs="true">
<param name="test-name" value="@{test-name}"/>
<param name="parameter-filter" value="@{parameter-filter}"/>
</antcall>
More information about the jboss-cvs-commits
mailing list