[jboss-cvs] JBossAS SVN: r62546 - branches/JBoss_4_0_2_CP/testsuite.

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

Author: jaroslaw.kijanowski
Date: 2007-04-25 10:05:43 -0400 (Wed, 25 Apr 2007)
New Revision: 62546

Modified:
   branches/JBoss_4_0_2_CP/testsuite/build.xml
Log:
fix compatibility matrix

Modified: branches/JBoss_4_0_2_CP/testsuite/build.xml
===================================================================
--- branches/JBoss_4_0_2_CP/testsuite/build.xml	2007-04-25 13:59:14 UTC (rev 62545)
+++ branches/JBoss_4_0_2_CP/testsuite/build.xml	2007-04-25 14:05:43 UTC (rev 62546)
@@ -2814,11 +2814,13 @@
     <macrodef name="execute-matrix-unit">
         <attribute name="test-name"/>
         <attribute name="parameter-filter"/>
+        <attribute name="parameter-exclude-filter" default=""/>
         <sequential>
             <!-- this requires antcall as a property can't be redefined -->
             <antcall target="execute-matrix-unit-target">
                 <param name="test-name" value="@{test-name}"/>
                 <param name="parameter-filter" value="@{parameter-filter}"/>
+                <param name="parameter-exclude-filter" value="@{parameter-exclude-filter}"/>
             </antcall>
         </sequential>
     </macrodef>
@@ -2833,6 +2835,7 @@
                 <path >
                     <fileset dir="${build.classes}">
                         <include name="${parameter-filter}"/>
+                        <exclude name="${parameter-exclude-filter}"/>
                    </fileset>
                 </path>
             </pathconvert>
@@ -2859,8 +2862,12 @@
               <classpath>
                 <pathelement location="${build.classes}"/>
                 <pathelement location="${build.resources}"/>
+                <pathelement path="${jboss.server.lib}/jboss.jar"/>
+                <pathelement path="${jboss.jmx.lib}/jboss-jmx.jar"/>
+                <pathelement path="${jboss.webservice.lib}/jboss-ws4ee.jar"/>
+                <pathelement path="${jboss.dist}/client/jbossall-client.jar"/>
                 <fileset dir="${current-version-dir}" includes="*.jar"/>
-                <path refid="thirdparty.classpath" />
+                <path refid="library.classpath" />
               </classpath>
                 <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
                   usefile="${junit.formatter.usefile}"
@@ -2881,7 +2888,8 @@
 
     <target name="tests-standard-unit-matrix-version">
         <execute-matrix-unit test-name="client" parameter-filter="org/jboss/test/client/**/*TestCase.class"/>
-        <execute-matrix-unit test-name="WebService" parameter-filter="org/jboss/test/webservice/**/*TestCase.class"/>
+        <execute-matrix-unit test-name="WebService" parameter-filter="org/jboss/test/webservice/**/*TestCase.class" parameter-exclude-filter="org/jboss/test/webservice/marshalltest/MarshallRpcLiteralTestCase.class"/>
+        <execute-matrix-unit test-name="WebService2" parameter-filter="org/jboss/test/webservice/marshalltest/MarshallRpcLiteralTestCase.class"/>
         <execute-matrix-unit test-name="BMP" parameter-filter="org/jboss/test/bmp/**/*TestCase.class"/>
         <execute-matrix-unit test-name="CMP" parameter-filter="org/jboss/test/cmp2/**/*TestCase.class"/>
         <execute-matrix-unit test-name="JBossMX" parameter-filter="org/jboss/test/jbossmx/**/*TestCase.class"/>