[Jboss-cvs] JBossAS SVN: r56957 - trunk/tools/etc/cruisecontrol/scripts

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

Author: rrajesh
Date: 2006-09-18 19:28:52 -0400 (Mon, 18 Sep 2006)
New Revision: 56957

Modified:
   trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml
Log:
updated for microcontainer testsuite runs with jdk1.4

Modified: trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml	2006-09-18 23:17:32 UTC (rev 56956)
+++ trunk/tools/etc/cruisecontrol/scripts/build-microcontainer-head-testsuite.xml	2006-09-18 23:28:52 UTC (rev 56957)
@@ -1,20 +1,27 @@
 <project name="build-microcontainer-head-testsuite" default="copyresults">
 
-    <property name="cvs.repository" value=":pserver:anonymous at anoncvs.forge.jboss.com:/cvsroot/jboss"/>
-    <property name="log.dir" value="${basedir}/logbuild/microcontainer-head-testsuite"/>
-    <property name="proj.dir" value="../checkout/microcontainer-head-testsuite"/>
+    <property name="log.dir" value="${basedir}/logbuild/${jboss.dir}"/>
+    <property name="proj.dir" value="../checkout/${jboss.dir}"/>
     <property environment="env"/>
 
     <import file="build-common.xml"/>
 
+    <property name="microcontainer-head-testsuite-14-jdk" value="${java14}"/>
+    <property name="microcontainer-head-testsuite-jdk" value="${java15}"/>
+    <propertycopy name="java.home.dir" from="${jboss.dir}-jdk"/>
+   
+    <property name="microcontainer-head-testsuite-14-xml" value="build-test14.xml"/>
+    <property name="microcontainer-head-testsuite-xml" value="build-test.xml"/>
+    <propertycopy name="build.test.xml" from="${jboss.dir}-xml"/>
+    	
     <target name="clean" depends="" description="Cleans checkout directory">
         <sequential>
             <antcall target="clean.checkout">
-               <param name="checkout.dir" value="../checkout/microcontainer-head-testsuite"/>
+               <param name="checkout.dir" value="../checkout/${jboss.dir}"/>
                <param name="artifacts.dir" value="${log.dir}"/>
             </antcall>
             <antcall target="version">
-                <param name="java.home" value="/opt/jdk1.5.0_03"/>
+                <param name="java.home" value="${java.home.dir}"/>
                 <param name="ant.home" value="${env.ANT_HOME}"/>
             </antcall>
         </sequential>
@@ -32,12 +39,12 @@
         <sequential>
         <exec executable="bash" dir="${proj.dir}/build" failonerror="false"  resultproperty="build.returncode" output="${log.dir}/build.log">
             <arg line="build.sh"/>
-            <env key="PATH" path="/opt/jdk1.5.0_03/bin:${env.PATH}"/>
-            <env key="JAVA_HOME" path="/opt/jdk1.5.0_03"/>
+            <env key="PATH" path="${java15}/bin:${env.PATH}"/>
+            <env key="JAVA_HOME" path="${java15}"/>
         </exec>
         <antcall target="copylogs">
            <param name="dest.dir" value="${log.dir}"/>
-           <param name="proj.dir" value="microcontainer-head-testsuite"/>
+           <param name="proj.dir" value="${jboss.dir}"/>
         </antcall>
         <condition property="build.success">
           <equals arg1="${build.returncode}" arg2="0"/>
@@ -65,17 +72,27 @@
         </antcall>        
         <antcall target="copylogs">
            <param name="dest.dir" value="${log.dir}"/>
-           <param name="proj.dir" value="microcontainer-head-testsuite"/>
+           <param name="proj.dir" value="${jboss.dir}"/>
         </antcall>
         </sequential>
     </target>
     
     
     <target name="runtests" description="Runs the microcontainer tests">
+        <exec executable="ant" failonerror="true" output="${log.dir}/tests.log" append="true">
+            <arg line=" -buildfile ${proj.dir}/${checkout.dir}/build-test.xml"/>
+            <env key="PATH" path="${java15}/bin:${env.PATH}"/>
+            <env key="JAVA_HOME" path="${java15}"/>
+        </exec> 
+    	<exec executable="ant" failonerror="true" output="${log.dir}/tests.log" append="true">
+            <arg line=" -buildfile ${proj.dir}/${checkout.dir}/${build.test.xml}"/>
+            <env key="PATH" path="${java15}/bin:${env.PATH}"/>
+            <env key="JAVA_HOME" path="${java15}"/>
+        </exec>    	
         <exec executable="ant" failonerror="false" resultproperty="tests.${checkout.dir}.returncode" output="${log.dir}/tests.log" append="true">
-            <arg line=" -buildfile ${proj.dir}/${checkout.dir}/build-test.xml tests"/>
-            <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 ${proj.dir}/${checkout.dir}/${build.test.xml} tests"/>
+            <env key="PATH" path="${java.home.dir}/bin:${env.PATH}"/>
+            <env key="JAVA_HOME" path="${java.home.dir}"/>
         </exec>
         <condition property="tests.${checkout.dir}.success">
           <equals arg1="${tests.container.returncode}" arg2="0"/>