[Jboss-cvs] JBossAS SVN: r55453 - branches/Branch_4_0/testsuite

[jboss-cvs-commits at lists.jboss.org]

Author: bstansberry at jboss.com
Date: 2006-08-09 15:09:40 -0400 (Wed, 09 Aug 2006)
New Revision: 55453

Modified:
   branches/Branch_4_0/testsuite/build.xml
Log:
Pass the filesystem location of the clustering configs as a system property

Modified: branches/Branch_4_0/testsuite/build.xml
===================================================================
--- branches/Branch_4_0/testsuite/build.xml	2006-08-09 18:55:31 UTC (rev 55452)
+++ branches/Branch_4_0/testsuite/build.xml	2006-08-09 19:09:40 UTC (rev 55453)
@@ -1061,18 +1061,22 @@
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.non.http.includes"/>
       <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
+      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
     </antcall>
-
+    
     <echo message="Going to call target tests-clustering-unit for HTTP tests (ASYNC, no BR)"/>
 
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.http.includes"/>
       <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-0"/>
+      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-1"/>
     </antcall>
-
+    
     <server:stop name="cluster-${jboss-junit-configuration}-0"/>
     <server:stop name="cluster-${jboss-junit-configuration}-1"/>
-
+    
     <sleep seconds="4"/>
 
     <echo message="Going to call target tests-clustering-unit again for FIELD granularity tests (ASYNC, no BR)"/>
@@ -1085,6 +1089,8 @@
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.field.includes"/>
       <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/>
+      <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-0"/>
+      <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-1"/>
     </antcall>
 
     <server:stop name="cluster-field-${jboss-junit-configuration}-0"/>
@@ -1102,6 +1108,8 @@
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.http.jk.includes"/>
       <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
+      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-SYNC-0"/>
+      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-SYNC-1"/>
     </antcall>
 
     <antcall target="tests-clustering-unit">
@@ -1124,6 +1132,8 @@
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.field.includes"/>
       <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/>
+      <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
+      <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-SYNC-1"/>
     </antcall>
 
     <server:stop name="cluster-field-${jboss-junit-configuration}-SYNC-0"/>
@@ -1141,6 +1151,8 @@
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.http.includes"/>
       <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+      <param name="jbosstest.cluster.node0.config" value="cluster-${jboss-junit-configuration}-BR-0"/>
+      <param name="jbosstest.cluster.node1.config" value="cluster-${jboss-junit-configuration}-BR-1"/>
     </antcall>
 
     <server:stop name="cluster-${jboss-junit-configuration}-BR-0"/>
@@ -1158,6 +1170,8 @@
     <antcall target="tests-clustering-unit">
       <param name="cluster.includes.refid" value="cluster.field.includes"/>
       <param name="jboss-junit-configuration" value="BuddyReplEnabled-${jboss-junit-configuration}"/>
+      <param name="jbosstest.cluster.node0.config" value="cluster-field-${jboss-junit-configuration}-BR-0"/>
+      <param name="jbosstest.cluster.node1.config" value="cluster-field-${jboss-junit-configuration}-BR-1"/>
     </antcall>
 
     <server:stop name="cluster-field-${jboss-junit-configuration}-BR-0"/>
@@ -1550,9 +1564,11 @@
       <sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
       <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.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node0.config}"/>
       <sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
       <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.serverroot" value="${jboss.dist}/server/${jbosstest.cluster.node1.config}"/>
       <sysproperty key="build.testlog" value="${build.testlog}"/>
       <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
       <!-- Pass along any jbosstest.* system properties -->