[jboss-cvs] JBossAS SVN: r68846 - in branches/Branch_4_2/testsuite: imports and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jan 10 16:56:16 EST 2008
Author: pgier
Date: 2008-01-10 16:56:16 -0500 (Thu, 10 Jan 2008)
New Revision: 68846
Modified:
branches/Branch_4_2/testsuite/build.xml
branches/Branch_4_2/testsuite/imports/server-config.xml
Log:
[JBBUILD-324] Allow multiple jvm options to junit.
Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml 2008-01-10 21:50:46 UTC (rev 68845)
+++ branches/Branch_4_2/testsuite/build.xml 2008-01-10 21:56:16 UTC (rev 68846)
@@ -1401,7 +1401,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}"/>
@@ -1439,7 +1439,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}"/>
<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"/>
@@ -1574,7 +1574,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}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="jbosstest.secure" value="true"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -1762,7 +1762,7 @@
<junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="true" timeout="600000"
jvm="${junit.jvm}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<jvmarg value="-XX:MaxPermSize=768m"/>
<jvmarg value="-Xms256m"/>
<jvmarg value="-Xmx256m"/>
@@ -1933,7 +1933,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}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<jvmarg value="-Djava.security.manager"/>
@@ -1976,7 +1976,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}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -2012,7 +2012,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}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -2047,7 +2047,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}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
<sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
@@ -2131,7 +2131,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}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2426,7 +2426,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}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<jvmarg value="-Djava.security.manager"/>
@@ -2473,7 +2473,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}"/>
@@ -2518,7 +2518,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}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2565,7 +2565,7 @@
<junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
timeout="${junit.timeout}" showoutput="${junit.showoutput}" 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}"/>
@@ -2623,7 +2623,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}"/>
<sysproperty key="jbosstest.server.host" value="${node0}"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
<sysproperty key="build.testlog" value="${build.testlog}"/>
@@ -2679,7 +2679,7 @@
<junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="${junit.fork}"
timeout="${junit.timeout}" showoutput="${junit.showoutput}" 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}"/>
@@ -2733,9 +2733,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}"/>
@@ -2783,7 +2782,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="jbosstest.server.host" value="${node0}"/>
@@ -3020,7 +3019,7 @@
<junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="true"
timeout="${junit.timeout}" jvm="${junit-jvm-command}">
- <jvmarg value="${junit.jvm.options}"/>
+ <jvmarg line="${junit.jvm.options}"/>
<!-- Used for JGroups -->
<jvmarg value="-Dbind.address=${node0}"/>
<jvmarg value="${client-serialization-flag}"/>
Modified: branches/Branch_4_2/testsuite/imports/server-config.xml
===================================================================
--- branches/Branch_4_2/testsuite/imports/server-config.xml 2008-01-10 21:50:46 UTC (rev 68845)
+++ branches/Branch_4_2/testsuite/imports/server-config.xml 2008-01-10 21:56:16 UTC (rev 68846)
@@ -666,7 +666,7 @@
<jvmarg value="${junit.jvm.options}"/>
-->
- <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