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

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

Author: rrajesh
Date: 2006-10-20 16:52:22 -0400 (Fri, 20 Oct 2006)
New Revision: 57763

Added:
   trunk/tools/etc/cruisecontrol/scripts/jboss-aop.properties
Modified:
   trunk/tools/etc/cruisecontrol/scripts/build-aop-head-testsuite.xml
Log:
Added jdk14 test runs

Modified: trunk/tools/etc/cruisecontrol/scripts/build-aop-head-testsuite.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-aop-head-testsuite.xml	2006-10-20 19:21:05 UTC (rev 57762)
+++ trunk/tools/etc/cruisecontrol/scripts/build-aop-head-testsuite.xml	2006-10-20 20:52:22 UTC (rev 57763)
@@ -45,17 +45,18 @@
 
     <target name="tests" depends="build" description="Runs the aop tests">
 	<sequential>
+		<copy file="jboss-aop.properties" tofile="../checkout/${jboss.dir}/aop/local.properties"/>
+
+        <exec executable="bash" failonerror="false" dir="../checkout/${jboss.dir}/aop/"  resultproperty="tests14.returncode"  output="${log.dir}/tests-jdk14.log">
+            <arg line="build.sh -f build-tests-jdk14.xml tests"/>
+            <env key="PATH" path="${java15}/bin:${env.PATH}"/>
+            <env key="JAVA_HOME" path="${java15}"/> 
+        </exec>	
         <exec executable="bash" failonerror="false" dir="../checkout/${jboss.dir}/aop/"  resultproperty="tests50.returncode"  output="${log.dir}/tests-jdk50.log">
             <arg line="build.sh -f build-tests-jdk50.xml tests tests-report-html"/>
             <env key="PATH" path="${java15}/bin:${env.PATH}"/>
             <env key="JAVA_HOME" path="${java15}"/> 
-        </exec>
-		<!--
-        <exec executable="bash" failonerror="false" dir="../checkout/${jboss.dir}/aop/"  resultproperty="tests50.returncode"  output="${log.dir}/tests-jdk14.log">
-            <arg line="build.sh -f build-tests-jdk14.xml tests"/>
-            <env key="PATH" path="${java15}/bin:${env.PATH}"/>
-            <env key="JAVA_HOME" path="${java15}"/> 
-        </exec>-->		
+        </exec>		
         <antcall target="copylogs">
            <param name="dest.dir" value="${log.dir}"/>
            <param name="proj.dir" value="${jboss.dir}"/>
@@ -67,14 +68,14 @@
           Exit code: ${tests50.returncode}
           See tests-jdk50.log in Build Artifacts for details.
         </fail>
-		<!--
+
         <condition property="tests14.success">
           <equals arg1="${tests14.returncode}" arg2="0"/>
         </condition>
         <fail unless="tests14.success">
           Exit code: ${tests14.returncode}
           See tests-jdk14.log in Build Artifacts for details.
-        </fail>-->		
+        </fail>		
         </sequential>	
     </target>
 

Added: trunk/tools/etc/cruisecontrol/scripts/jboss-aop.properties
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/jboss-aop.properties	2006-10-20 19:21:05 UTC (rev 57762)
+++ trunk/tools/etc/cruisecontrol/scripts/jboss-aop.properties	2006-10-20 20:52:22 UTC (rev 57763)
@@ -0,0 +1 @@
+jdk14.executable=/opt/j2sdk1.4.2_09/bin/java
\ No newline at end of file