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

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

Author: dimitris at jboss.org
Date: 2008-11-25 12:51:03 -0500 (Tue, 25 Nov 2008)
New Revision: 81563

Modified:
   branches/Branch_4_2/testsuite/build.xml
Log:
do not test JBM (AS5) -> JBossMQ (AS42), or appclient

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2008-11-25 17:41:53 UTC (rev 81562)
+++ branches/Branch_4_2/testsuite/build.xml	2008-11-25 17:51:03 UTC (rev 81563)
@@ -2938,7 +2938,7 @@
     <test-compatibility client-version="4_2_2_GA" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
     <test-compatibility client-version="4_2_3_GA" client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
     <test-compatibility client-version="4_2_x"    client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
-    <test-compatibility client-version="5_0_x"    client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
+    <test-compatibility50x client-version="5_0_x"    client-jdk="${jdk15}" client-serialization-flag="-Dnone" serialization-flag="-Dnone" server-config="default"/>
     <!-- testing interoperating with clients using the pooled invokers -->
     <test-compatibility-pooled-invokers client-version="4_0_3"    client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy"/>
     <test-compatibility-pooled-invokers client-version="4_0_3SP1" client-jdk="${jdk14}" client-serialization-flag="-Dnone" serialization-flag="-Dorg.jboss.invocation.pooled.Legacy"/>
@@ -2992,6 +2992,26 @@
     </sequential>
   </macrodef>
 
+  <macrodef name="test-compatibility50x">
+    <attribute name="client-version"/>
+    <attribute name="client-jdk"/>
+    <attribute name="client-serialization-flag"/>    
+    <attribute name="serialization-flag"/>
+    <attribute name="server-config"/>
+    <sequential>
+      <start-jboss conf="@{server-config}" jvmargs="-Xmx128m @{serialization-flag}"/>
+      <wait-on-host/>
+      <antcall target="tests-standard-unit-matrix-version50x">
+        <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>
+      <stop-jboss jvmargs="@{serialization-flag}"/>
+      <wait-on-shutdown conf="@{server-config}"/>
+    </sequential>
+  </macrodef>
+  
   <target name="tests-standard-unit-matrix-version">
     <execute-matrix-unit test-name="testbyvalue" parameter-filter="org/jboss/test/testbyvalue/test/**/*TestCase.class"/>
     <execute-matrix-unit test-name="client" parameter-filter="org/jboss/test/client/**/*TestCase.class"/>
@@ -3000,6 +3020,12 @@
     <execute-matrix-unit test-name="jms" parameter-filter="org/jboss/test/jbossmq/test/JBossMQUnitTest.class"/>
   </target>
 
+  <target name="tests-standard-unit-matrix-version50x">
+    <execute-matrix-unit test-name="testbyvalue" parameter-filter="org/jboss/test/testbyvalue/test/**/*TestCase.class"/>
+    <execute-matrix-unit test-name="bmp" parameter-filter="org/jboss/test/bmp/**/*TestCase.class"/>
+    <execute-matrix-unit test-name="cmp2" parameter-filter="org/jboss/test/cmp2/**/*TestCase.class"/>
+  </target>
+  
   <target name="tests-standard-unit-matrix-version-pooled">
     <execute-matrix-unit test-name="pooled-invoker" parameter-filter="org/jboss/test/pooled/test/**/BeanStressTestCase.class"/>
   </target>