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

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

Author: rrajesh
Date: 2007-05-07 07:38:43 -0400 (Mon, 07 May 2007)
New Revision: 62834

Modified:
   branches/Branch_4_2/testsuite/build.xml
Log:
JBQA-619 Ability to run the compatibility tests using different jdks

Modified: branches/Branch_4_2/testsuite/build.xml
===================================================================
--- branches/Branch_4_2/testsuite/build.xml	2007-05-07 10:59:57 UTC (rev 62833)
+++ branches/Branch_4_2/testsuite/build.xml	2007-05-07 11:38:43 UTC (rev 62834)
@@ -105,6 +105,7 @@
     <path refid="apache.log4j.classpath"/>
     <path refid="apache.scout.classpath"/>
     <path refid="apache.xerces.classpath"/>
+  	<path refid="apache.xml.commons.classpath"/>
     <path refid="dom4j.dom4j.classpath"/>
     <path refid="hibernate3.classpath"/>
     <path refid="hsqldb.hsqldb.classpath"/>
@@ -203,6 +204,7 @@
 
   <!-- Where build generated files will go -->
   <property name="build.classes" value="${module.output}/classes"/>
+  <property name="build.classes14" value="${module.output}/classes14"/>
   <property name="build.lib" value="${module.output}/lib"/>
   <property name="build.api" value="${module.output}/api"/>
   <property name="build.etc" value="${module.output}/etc"/>
@@ -386,6 +388,23 @@
     </javac>
   </target>
 
+  <target name="compile-compatibility-classes">
+    <mkdir dir="${build.classes14}"/>
+    <javac srcdir="${source.java}" destdir="${build.classes14}" optimize="${javac.optimize}" source="1.4" target="1.4" debug="${javac.debug}" depend="${javac.depend}"
+      verbose="${javac.verbose}" deprecation="${javac.deprecation}" includeAntRuntime="${javac.include.ant.runtime}" includeJavaRuntime="${javac.include.java.runtime}"
+      failonerror="${javac.fail.onerror}">
+      <include name="org/jboss/test/testbyvalue/test/**/*TestCase.java"/>
+      <include name="org/jboss/test/client/**/*TestCase.java"/>
+      <include name="org/jboss/test/bmp/**/*TestCase.java"/>
+      <include name="org/jboss/test/cmp2/**/*TestCase.java"/>
+      <include name="org/jboss/test/jbossmq/test/JBossMQUnitTest.java"/>
+      <include name="org/jboss/test/pooled/test/**/BeanStressTestCase.java"/>   
+      <include name="org/jboss/test/compatibility/test/matrix/MatrixTestContainer.java"/>
+      <include name="org/jboss/ant/taskdefs/XMLJUnitMultipleResultFormatter.java"/>      
+      <classpath refid="tests.compile.classpath"/>
+    </javac>
+  </target>
+  
   <target name="compile-stubs">
     <rmic base="${build.classes}" sourcebase="${build.classes}" verify="${rmic.verify}" iiop="${rmic.iiop}" iiopopts="${rmic.iiopopts}" idl="${rmic.idl}"
       idlopts="${rmic.idlops}" debug="${rmic.debug}" stubVersion="${rmic.stubVersion}">
@@ -2885,12 +2904,12 @@
   <target name="execute-matrix-unit-target">
     <echo message=">>>>>> Executing test=${test-name} filter=${parameter-filter}"/>
     <pathconvert pathSep="," dirSep="/" property="jbosstest.hometest">
-      <path location="${build.classes}"/>
+      <path location="${build.classes14}"/>
     </pathconvert>
 
     <pathconvert pathSep="," dirSep="/" property="jbosstest.executionlist">
       <path>
-        <fileset dir="${build.classes}">
+        <fileset dir="${build.classes14}">
           <include name="${parameter-filter}"/>
         </fileset>
       </path>
@@ -2914,7 +2933,7 @@
         <propertyref prefix="jbosstest."/>
       </syspropertyset>
       <classpath>
-        <pathelement location="${build.classes}"/>
+        <pathelement location="${build.classes14}"/>
         <pathelement location="${build.resources}"/>
         <fileset dir="${current-version-dir}" includes="*.jar"/>
         <path refid="thirdparty.classpath"/>
@@ -2924,7 +2943,7 @@
 
       <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" fork="${junit.batchtest.fork}">
 
-        <fileset dir="${build.classes}">
+        <fileset dir="${build.classes14}">
           <include name="org/jboss/test/compatibility/test/matrix/MatrixTestContainer.class"/>
         </fileset>
       </batchtest>