[jboss-cvs] JBossAS SVN: r60018 - branches/Branch_4_2/testsuite.

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

Author: rrajesh
Date: 2007-01-26 07:27:37 -0500 (Fri, 26 Jan 2007)
New Revision: 60018

Modified:
   branches/Branch_4_2/testsuite/build.xml
Log:
JBQA-619 Ability to run the compatibility tests with different jdk's

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-01-26 12:23:11 UTC (rev 60017)
+++ branches/Branch_4_2/testsuite/build.xml	2007-01-26 12:27:37 UTC (rev 60018)
@@ -2900,29 +2900,34 @@
   
   <target name="tests-matrix" description="Executes only the version check compatibility suite. Use -Dmatrix-versions=[version container] for this task"
     depends="maybejars" if="matrix-versions">
-    
-    <test-compatibility client-version="3_2_8SP1" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dorg.jboss.j2ee.Serialization"/>
-    <test-compatibility client-version="3_2_x" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dorg.jboss.j2ee.Serialization"/>
-    <test-compatibility client-version="4_0_1SP1" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy -Dorg.jboss.j2ee.LegacySerialization"
+   
+    <fail message="Use -Dmatrix-versions=[version container] for this task" unless="matrix-versions"/>
+    <fail message="Set -Djdk14= to a JDK1.4 installation" unless="jdk14"/>
+    <fail message="Set -Djdk15= to a JDK1.5 installation" unless="jdk15"/>
+ 
+    <test-compatibility client-version="3_2_8SP1" client-jdk="${jdk14}" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dorg.jboss.j2ee.Serialization"/>
+    <test-compatibility client-version="3_2_x" client-jdk="${jdk14}" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dorg.jboss.j2ee.Serialization"/>
+    <test-compatibility client-version="4_0_1SP1" client-jdk="${jdk14}" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy -Dorg.jboss.j2ee.LegacySerialization"
       client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_2" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_3" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_3SP1" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_4_GA" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_5_GA" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_0_x" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
-    <test-compatibility client-version="4_2_x" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+    <test-compatibility client-version="4_0_2" client-jdk="${jdk14}" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
+    <test-compatibility client-version="4_0_3" client-jdk="${jdk14}" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
+    <test-compatibility client-version="4_0_3SP1" client-jdk="${jdk14}" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
+    <test-compatibility client-version="4_0_4_GA" client-jdk="${jdk14}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+    <test-compatibility client-version="4_0_5_GA" client-jdk="${jdk14}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+    <test-compatibility client-version="4_0_x" client-jdk="${jdk14}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+    <test-compatibility client-version="4_2_x" client-jdk="${jdk15}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
     
-    <test-compatibility-pooledInvokers client-version="4_0_3" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_0_3SP1" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_0_4_GA" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_0_5_GA" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_0_x" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
-    <test-compatibility-pooledInvokers client-version="4_2_x" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+    <test-compatibility-pooledInvokers client-version="4_0_3" client-jdk="${jdk14}" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
+    <test-compatibility-pooledInvokers client-version="4_0_3SP1" client-jdk="${jdk14}" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy" client-serialization-flag="-Dnone"/>
+    <test-compatibility-pooledInvokers client-version="4_0_4_GA" client-jdk="${jdk14}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+    <test-compatibility-pooledInvokers client-version="4_0_5_GA" client-jdk="${jdk14}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+    <test-compatibility-pooledInvokers client-version="4_0_x" client-jdk="${jdk14}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
+    <test-compatibility-pooledInvokers client-version="4_2_x" client-jdk="${jdk15}" serialization-flag="-Dnone" client-serialization-flag="-Dnone"/>
   </target>
   
   <macrodef name="test-compatibility-pooledInvokers">
     <attribute name="client-version"/>
+    <attribute name="client-jdk"/>
     <attribute name="serialization-flag"/>
     <attribute name="client-serialization-flag"/>
     <sequential>
@@ -2930,6 +2935,7 @@
       <wait-on-host/>
       <antcall target="tests-standard-unit-matrix-version-pooled">
         <param name="matrix-configuration" value="@{client-version}"/>
+	<param name="junit-jvm-command" value="@{client-jdk}/bin/java"/>
         <param name="current-version-dir" value="${matrix-versions}/@{client-version}"/>
         <param name="client-serialization-flag" value="@{client-serialization-flag}"/>
       </antcall>
@@ -2940,6 +2946,7 @@
   
   <macrodef name="test-compatibility">
     <attribute name="client-version"/>
+    <attribute name="client-jdk"/>
     <attribute name="serialization-flag"/>
     <attribute name="client-serialization-flag"/>
     <sequential>
@@ -2947,6 +2954,7 @@
       <wait-on-host/>
       <antcall target="tests-standard-unit-matrix-version">
         <param name="matrix-configuration" value="@{client-version}"/>
+	<param name="junit-jvm-command" value="@{client-jdk}/bin/java"/>
         <param name="current-version-dir" value="${matrix-versions}/@{client-version}"/>
         <param name="client-serialization-flag" value="@{client-serialization-flag}"/>
       </antcall>
@@ -2994,7 +3002,7 @@
     </pathconvert>
     
     <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" haltonfailure="${junit.haltonfailure}" fork="true"
-      timeout="${junit.timeout}" jvm="${junit.jvm}">
+      timeout="${junit.timeout}" jvm="${junit-jvm-command}">
       
       <jvmarg value="${junit.jvm.options}"/>
       <!-- Used for JGroups -->