[jboss-cvs] JBossAS SVN: r109606 - branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/config.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 30 18:38:50 EST 2010
Author: rachmatowicz at jboss.com
Date: 2010-11-30 18:38:50 -0500 (Tue, 30 Nov 2010)
New Revision: 109606
Modified:
branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/config/tests-clustering.xml
Log:
Fix up broken one-test clustering targets (JBAS-8540)
Modified: branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/config/tests-clustering.xml
===================================================================
--- branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/config/tests-clustering.xml 2010-11-30 23:37:43 UTC (rev 109605)
+++ branches/JBoss-AS-6.0.x-ipv6/testsuite/imports/config/tests-clustering.xml 2010-11-30 23:38:50 UTC (rev 109606)
@@ -389,8 +389,6 @@
timeout="${junit.timeout}"
jvm="${junit.jvm}"
failureProperty="tests.failure">
-
- <sysproperty key="java.net.preferIPv4Stack" value="true"/>
<sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/>
<sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
@@ -455,6 +453,80 @@
</junit>
</target>
+ <!--
+ Executes a single test in a clustered environment
+ where test specifies the fully qualified test and package name
+ -->
+ <target name="one-test-clustering-unit" depends="init">
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.testlog}"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="${junit.timeout}"
+ jvm="${junit.jvm}"
+ failureProperty="tests.failure">
+
+ <sysproperty key="jboss.internal-server.serverroot" value="${jboss.dist}/server"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
+ <sysproperty key="jbosstest.cluster.node0.url" value="${node0.url}"/>
+ <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
+ <sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.cluster.node0.hajndi.url" value="${node0.hajndi.url}"/>
+ <sysproperty key="jbosstest.cluster.node0.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node0.config}"/>
+ <sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
+ <sysproperty key="jbosstest.cluster.node1.url" value="${node1.url}"/>
+ <sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
+ <sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
+ <sysproperty key="jbosstest.cluster.node1.hajndi.url" value="${node1.hajndi.url}"/>
+ <sysproperty key="jbosstest.cluster.node1.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node1.config}"/>
+ <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+ <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
+ <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>
+
+ <!--Lets pass some parameters from local.properties file as system properties-->
+ <syspropertyset>
+ <propertyref prefix="org.apache."/>
+ </syspropertyset>
+ <syspropertyset>
+ <propertyref prefix="apache"/>
+ </syspropertyset>
+ <syspropertyset>
+ <propertyref prefix="node"/>
+ </syspropertyset>
+
+ <!--jvmarg value="${junit.jvm.options}"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8789,server=y,suspend=y"/>
+ <jvmarg value="-Djava.compiler=NONE"/>
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/-->
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <!-- definition of the property for keeping results between configuration -->
+ <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+ <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" />
+
+ <test todir="${build.reports}" name="${test}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}"/>
+ </junit>
+ </target>
+
+
<!-- Launches a test assuming the AS instances are already running -->
<target name="one-cluster-test-nostart" if="test">
@@ -462,7 +534,7 @@
<echo message="Going to call target tests-clustering-unit for ${test}"/>
- <antcall target="tests-clustering-unit" inheritRefs="true">
+ <antcall target="one-test-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="one.test.includes"/>
<param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
<param name="jbosstest.cluster.web.cache.config" value="standard-session-cache"/>
@@ -483,7 +555,7 @@
<echo message="Going to call target tests-clustering-unit for ${test}"/>
- <antcall target="tests-clustering-unit" inheritRefs="true">
+ <antcall target="one-test-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="one.test.includes"/>
<param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
<param name="jbosstest.cluster.web.cache.config" value="standard-session-cache"/>
@@ -506,7 +578,7 @@
<echo message="Going to call target tests-clustering-unit for ${test}"/>
- <antcall target="tests-clustering-unit" inheritRefs="true">
+ <antcall target="one-test-clustering-unit" inheritRefs="true">
<param name="cluster.includes.refid" value="one.test.includes"/>
<param name="jboss-junit-configuration" value="DIST-${jboss-junit-configuration}"/>
<param name="jbosstest.cluster.web.cache.config" value="standard-session-cache/sync"/>
More information about the jboss-cvs-commits
mailing list