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

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

Author: rrajesh
Date: 2006-09-10 21:27:57 -0400 (Sun, 10 Sep 2006)
New Revision: 56705

Modified:
   trunk/tools/etc/cruisecontrol/scripts/build-jboss-portal.xml
Log:
Run portal testsuite against jboss-head with jdk1.5

Modified: trunk/tools/etc/cruisecontrol/scripts/build-jboss-portal.xml
===================================================================
--- trunk/tools/etc/cruisecontrol/scripts/build-jboss-portal.xml	2006-09-10 23:04:31 UTC (rev 56704)
+++ trunk/tools/etc/cruisecontrol/scripts/build-jboss-portal.xml	2006-09-11 01:27:57 UTC (rev 56705)
@@ -3,16 +3,10 @@
     <property name="log.dir" value="${basedir}/logbuild/${jboss.dir}"/>
    
     <property environment="env"/>
-    <property name="java.home" value="${env.JAVA_HOME}"/>
     <property name="jboss.host" value="localhost"/>
     <property name="jboss.port" value="8080"/>
 
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
-       <classpath>
-         <pathelement location="/opt/apache-ant-1.6.2/lib/ant-contrib.jar"/>
-       </classpath>
-    </taskdef>
-   
+
     <import file="build-common.xml"/>
 
     <target name="clean" depends="" description="Cleans checkout directory">
@@ -41,14 +35,17 @@
        <antcall target="runtests">
             <param name="jboss.home.dir" value="../checkout/jboss-builds/jboss-4.0.x/jboss-4.0.5.GA"/>
             <param name="jboss.version.info" value="4_0_x"/>
+            <param name="java.home.dir" value="${java14}"/>
         </antcall>      
         <antcall target="runtests">
             <param name="jboss.home.dir" value="../../jboss-4.0.4.GA"/>
             <param name="jboss.version.info" value="4_0_4_GA"/>
+            <param name="java.home.dir" value="${java14}"/>
         </antcall>
         <antcall target="runtests">
             <param name="jboss.home.dir" value="../checkout/jboss-builds/jboss-head/jboss-5.0.0.Beta"/>
             <param name="jboss.version.info" value="HEAD"/>
+            <param name="java.home.dir" value="${java15}"/>
         </antcall>
         <antcall target="copyresults"/>
     </target>
@@ -62,7 +59,7 @@
         <antcall target="build">
             <param name="jboss.version" value="${jboss.version.info}"/>
         </antcall>         
-        <tests jboss.home="${jboss.home.dir}" jboss.version="${jboss.version.info}"/>
+        <tests jboss.home="${jboss.home.dir}" jboss.version="${jboss.version.info}" java.home="${java.home.dir}"/>
         <copylogs jboss.home="${jboss.home.dir}" jboss.version="${jboss.version.info}"/>
     </target> 
     
@@ -87,11 +84,13 @@
     <macrodef name="tests">
     <attribute name="jboss.home" default=""/>    
     <attribute name="jboss.version" default=""/>
+    <attribute name="java.home" default=""/>
         <sequential>
         <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/tests.log" append="true">
             <arg line=" -buildfile ../checkout/${jboss.dir}/testsuite/build.xml -Djboss-junit-configuration=@{jboss.version} tests"/>
-            <env key="PATH" path="/opt/apache-ant-1.6.5/bin:${env.PATH}"/>            
+            <env key="PATH" path="@{java.home}/bin:/opt/apache-ant-1.6.5/bin:${env.PATH}"/>            
             <env key="JBOSS_HOME" path="@{jboss.home}"/>   
+            <env key="JAVA_HOME" path="@{java.home}"/>
             <env key="ANT_HOME" path="/opt/apache-ant-1.6.5"/>              
         </exec>        
         </sequential>