[jboss-cvs] JBossAS SVN: r68845 - in trunk/testsuite: imports and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 10 16:50:46 EST 2008
Author: pgier
Date: 2008-01-10 16:50:46 -0500 (Thu, 10 Jan 2008)
New Revision: 68845
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/server-config.xml
Log:
[JBBUILD-324] Allow multiple jvm options to junit.
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2008-01-10 21:49:30 UTC (rev 68844)
+++ trunk/testsuite/build.xml 2008-01-10 21:50:46 UTC (rev 68845)
@@ -1184,7 +1184,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<!-- Used for JGroups -->
<jvmarg value="-Dbind.address=${node0}"/>
<sysproperty key="jboss.dist" value="${jboss.dist}"/>
@@ -1232,7 +1232,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<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"/>
@@ -1285,7 +1285,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="jbosstest.secure" value="true"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -1367,7 +1367,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<sysproperty key="jboss.home" file="${project.root}"/>
<sysproperty key="jboss.thirdparty.dir" file="${project.root}/thirdparty"/>
@@ -1620,7 +1620,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<jvmarg value="-XX:MaxPermSize=512m"/>
<jvmarg value="-Xms256m"/>
<jvmarg value="-Xmx512m"/>
@@ -1831,7 +1831,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -1877,7 +1877,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -1922,7 +1922,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -2026,7 +2026,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<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"/>
@@ -2071,7 +2071,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<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"/>
@@ -2344,7 +2344,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<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"/>
@@ -2399,7 +2399,7 @@
<junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
timeout="${junit.timeout}" jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<!-- Used for JGroups -->
<jvmarg value="-Dbind.address=${node0}"/>
<sysproperty key="jboss.dist" value="${jboss.dist}"/>
@@ -2450,7 +2450,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<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"/>
@@ -2509,7 +2509,7 @@
showoutput="${junit.showoutput}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<jvmarg value="-Djava.security.manager"/>
<jvmarg value="-Dbind.address=${env.MYTESTIP_1}"/>
<jvmarg value="-Djava.security.policy==${build.resources}/client.policy"/>
@@ -2570,7 +2570,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<sysproperty key="jboss.dist" value="${jboss.dist}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2635,7 +2635,7 @@
showoutput="${junit.showoutput}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<!--
<jvmarg value="-Xdebug"/>
@@ -2705,9 +2705,8 @@
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xnoagent"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8686"/>
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
- <jvmarg value="${junit.jvm.options}"/>
<!-- Used for JGroups -->
<jvmarg value="-Dbind.address=${node0}"/>
<sysproperty key="jboss.dist" value="${jboss.dist}"/>
@@ -2772,7 +2771,7 @@
showoutput="${junit.showoutput}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<!-- <jvmarg value="-Xdebug"/>-->
<!-- <jvmarg value="-Xnoagent"/>-->
<!-- <jvmarg value="-Djava.compiler=NONE"/>-->
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2008-01-10 21:49:30 UTC (rev 68844)
+++ trunk/testsuite/imports/server-config.xml 2008-01-10 21:50:46 UTC (rev 68845)
@@ -1108,7 +1108,7 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<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"/>
More information about the jboss-cvs-commits
mailing list