[jboss-cvs] JBossAS SVN: r60017 - branches/Branch_4_0/testsuite.

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

Author: rrajesh
Date: 2007-01-26 07:23:11 -0500 (Fri, 26 Jan 2007)
New Revision: 60017

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

Modified: branches/Branch_4_0/testsuite/build.xml
===================================================================
--- branches/Branch_4_0/testsuite/build.xml	2007-01-26 10:39:17 UTC (rev 60016)
+++ branches/Branch_4_0/testsuite/build.xml	2007-01-26 12:23:11 UTC (rev 60017)
@@ -3286,26 +3286,31 @@
 
     <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">
+      
+      <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" 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" 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_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="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"    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_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_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_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>
@@ -3313,6 +3318,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>
@@ -3324,6 +3330,7 @@
 
     <macrodef name="test-compatibility">
       <attribute name="client-version"/>
+      <attribute name="client-jdk"/>
       <attribute name="serialization-flag"/>
       <attribute name="client-serialization-flag"/>
       <sequential>
@@ -3331,6 +3338,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>
@@ -3384,7 +3392,7 @@
               haltonfailure="${junit.haltonfailure}"
               fork="true"
               timeout="${junit.timeout}"
-              jvm="${junit.jvm}">
+              jvm="${junit-jvm-command}">
 
               <jvmarg value="${junit.jvm.options}"/>
               <!-- Used for JGroups -->