[jboss-cvs] JBossAS SVN: r57829 - trunk/tools/etc/cruisecontrol/scripts

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

Author: rrajesh
Date: 2006-10-25 15:57:23 -0400 (Wed, 25 Oct 2006)
New Revision: 57829

Modified:
   trunk/tools/etc/cruisecontrol/scripts/build-JBossCache.xml
Log:
Added jboss-cache testsuite on HEAD with jdk1.4

Modified: trunk/tools/etc/cruisecontrol/scripts/build-JBossCache.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-JBossCache.xml	2006-10-25 19:54:30 UTC (rev 57828)
+++ trunk/tools/etc/cruisecontrol/scripts/build-JBossCache.xml	2006-10-25 19:57:23 UTC (rev 57829)
@@ -4,8 +4,23 @@
     <property name="log.dir" value="${basedir}/logbuild/${jboss.dir}"/>
 
     <property environment="env"/>
-    <import file="build-common-targets.xml"/>
+    <import file="build-common.xml"/>
 
+    <property name="jboss-cache-testsuite-jdk" value="${java15}"/>
+    <property name="jboss-cache-testsuite-140-jdk" value="${java15}"/>
+    <property name="jboss-cache-testsuite-jdk14-jdk" value="${java14}"/>
+    <propertycopy name="java.home.dir" from="${jboss.dir}-jdk"/>
+	
+    <property name="jboss-cache-testsuite-build" value="jar"/>
+    <property name="jboss-cache-testsuite-140-build" value="jar"/>
+    <property name="jboss-cache-testsuite-jdk14-build" value="jar-retro"/>
+    <propertycopy name="build.target" from="${jboss.dir}-build"/>	
+   
+    <property name="jboss-cache-testsuite-test" value="all-unittests-cc"/>
+    <property name="jboss-cache-testsuite-140-test" value="all-unittests-cc"/>
+    <property name="jboss-cache-testsuite-jdk14-test" value="all-unittests-retro-cc"/>
+    <propertycopy name="test.target" from="${jboss.dir}-test"/>	
+    	
     <target name="clean" depends="" description="Cleans checkout directory">
         <sequential>
             <antcall target="clean.checkout">
@@ -26,7 +41,7 @@
     <target name="build" depends="getcode" description="Build the jbosscache project">    
         <sequential>
         <exec executable="ant" resultproperty="build.returncode" failonerror="false" output="${log.dir}/compile.log">
-            <arg line=" -buildfile ../checkout/${jboss.dir}/build.xml"/>
+            <arg line=" -buildfile ../checkout/${jboss.dir}/build.xml ${build.target}"/>
             <env key="PATH" path="/opt/jdk1.5.0_03/bin:${env.PATH}"/>
             <env key="JAVA_HOME" path="/opt/jdk1.5.0_03"/>            
         </exec>
@@ -47,9 +62,9 @@
     <target name="tests" depends="build" description="Runs the jbosscache tests">
         <sequential>
         <exec executable="ant" resultproperty="tests.returncode" failonerror="false" output="${log.dir}/tests.log">
-            <arg line=" -buildfile ../checkout/${jboss.dir}/build.xml all-unittests-cc interoptests"/>
-            <env key="PATH" path="/opt/jdk1.5.0_03/bin:${env.PATH}"/>
-            <env key="JAVA_HOME" path="/opt/jdk1.5.0_03"/>            
+            <arg line=" -buildfile ../checkout/${jboss.dir}/build.xml ${test.target} interoptests"/>
+            <env key="PATH" path="${java.home.dir}/bin:${env.PATH}"/>
+            <env key="JAVA_HOME" path="${java.home.dir}"/>            
         </exec>
         <antcall target="copylogs">
            <param name="dest.dir" value="${log.dir}"/>