|
From: Scott M S. <st...@us...> - 2004-10-31 15:10:07
|
User: starksm Date: 04/10/31 07:10:00 Modified: . Tag: Branch_4_0 build.xml Log: Use systempropertyset to pass in all jbosstest.* properties to the unit tests Revision Changes Path No revision No revision 1.406.2.14 +65 -32 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.13 retrieving revision 1.406.2.14 diff -u -r1.406.2.13 -r1.406.2.14 --- build.xml 31 Oct 2004 14:48:59 -0000 1.406.2.13 +++ build.xml 31 Oct 2004 15:09:59 -0000 1.406.2.14 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.13 2004/10/31 14:48:59 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.14 2004/10/31 15:09:59 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -857,9 +857,10 @@ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> <pathelement location="${build.resources}"/> @@ -898,9 +899,10 @@ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1006,6 +1008,10 @@ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1049,6 +1055,10 @@ <sysproperty key="jbosstest.secure" value="true"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" @@ -1095,12 +1105,10 @@ <jvmarg value="-Djava.security.manager"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="jbosstest.secure" value="true"/> - <sysproperty key="jbosstest.iterationcount" - value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.threadcount" - value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.beancount" - value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/> <sysproperty key="java.security.auth.login.config" @@ -1241,6 +1249,10 @@ <sysproperty key="jboss.tools.dir" file="${project.root}/tools"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="jbosstest.secure" value="true"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> <sysproperty key="build.testlog" value="${build.testlog}"/> @@ -1293,6 +1305,10 @@ <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> <sysproperty key="jboss.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1346,6 +1362,10 @@ <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> <sysproperty key="jboss.aop.path" file="${source.resources}/cache/standalone/META-INF/jboss-aop.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1384,6 +1404,10 @@ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1429,6 +1453,10 @@ value="${build.resources}/security/auth.conf"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1602,9 +1630,10 @@ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1643,9 +1672,10 @@ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1692,6 +1722,10 @@ <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <!-- The crimson parser cannot do schema validation, which we need for jaxrpc-mapping.xml --> <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/> @@ -1858,9 +1892,10 @@ <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> @@ -1921,9 +1956,10 @@ <jvmarg value="-Djava.security.policy==${build.resources}/${test}/client.policy"/> <sysproperty key="log4j.properties" file="${build.resources}/log4j.properties"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -1964,9 +2000,10 @@ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> <classpath> <pathelement location="${build.classes}"/> @@ -2011,10 +2048,6 @@ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/> - <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/> - <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/> - <sysproperty key="jbosstest.nodeploy" value="${jbosstest.nodeploy}"/> <sysproperty key="jbosstest.secure" value="true"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> |