You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by sm...@apache.org on 2007/03/21 13:03:30 UTC
svn commit: r520849 - in /harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative: HUT_iterative_run.bat HUT_iterative_run.sh build.xml project.template run.bat run.sh

Author: smishura
Date: Wed Mar 21 05:03:29 2007
New Revision: 520849

URL: http://svn.apache.org/viewvc?view=rev&rev=520849
Log:
Integrate classlib test iterative runs(on DRL VM) to CC. Now to run classlib tests in iterative mode the following steps should be done:
1) create modules/classlib-drlvm-iterative/cc.properties and provide valid entries in the file
2) run 'ant -Dmodule=classlib-drlvm-iterative setup'
3) run 'ant'

The update relates to HARMONY-3115:
([testing][buildtest module] the structure of buildtest module should be changed a little bit to improve testing capabilities)

and HARMONY-2655:
([buildtest][cc]iterative classlib tests runs incorporating)

Added:
    harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/run.bat
      - copied unchanged from r520828, harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/HUT_iterative_run.bat
    harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/run.sh
      - copied unchanged from r520828, harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/HUT_iterative_run.sh
Removed:
    harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/HUT_iterative_run.bat
    harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/HUT_iterative_run.sh
Modified:
    harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/build.xml
    harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/project.template

Modified: harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/build.xml?view=diff&rev=520849&r1=520848&r2=520849
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/build.xml Wed Mar 21 05:03:29 2007
@@ -31,9 +31,15 @@
     <target name="-setup" description="copy config file and scripts to target dir">
         <subant target="setup" buildpath="../drlvm" />
 
-        <copy file="HUT_iterative_run.bat" tofile="${target.dir}/HUT_iterative/HUT_iterative_run.bat" overwrite="true" />
-        <copy file="HUT_iterative_run.sh" tofile="${target.dir}/HUT_iterative/HUT_iterative_run.sh" overwrite="true" />
-        <copy file="modulesList" tofile="${target.dir}/HUT_iterative/modulesList" overwrite="true" />
+        <mkdir dir="${target.dir}/classlib-drlvm-iterative" />
+
+        <copy todir="${target.dir}/classlib-drlvm-iterative" overwrite="true">
+            <fileset dir=".">
+                <include name="run.bat" />
+                <include name="run.sh" />
+                <include name="modulesList" />
+            </fileset>
+        </copy >
     </target>
 
     <target name="-gen-config" depends="-gen-config-win,-gen-config-other">
@@ -53,13 +59,13 @@
 
     <target name="-gen-config-win" if="is.windows">
         <echo file="${propertyfile}" append="true">
-cmd_HUT_iterative=HUT_iterative_run.bat
+cmd_HUT_iterative=run.bat
 </echo>
     </target>
 
     <target name="-gen-config-other" unless="is.windows">
         <echo file="${propertyfile}" append="true">
-cmd_HUT_iterative=HUT_iterative_run.sh
+cmd_HUT_iterative=run.sh
 </echo>
     </target>
 

Modified: harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/project.template
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/project.template?view=diff&rev=520849&r1=520848&r2=520849
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/project.template (original)
+++ harmony/enhanced/buildtest/trunk/modules/classlib-drlvm-iterative/project.template Wed Mar 21 05:03:29 2007
@@ -31,7 +31,11 @@
 
     <schedule interval="${timeout}">
         <!--exec command="${sh}" args="${cmd.prefix} ${cmd_HUT_iterative} ${wdir}/projects/drlvm/trunk/build/${os}_ia32_${cc}_debug/deploy/jdk/jre drl ${HUT_forkmode} ${wdir}/projects/classlib/trunk ${HUT_iterations}" workingdir="HUT_iterative" timeout="${HUT_iterative_timeout}" errorstr="FAILED" /-->
-        <exec command="${sh}" args="${cmd.prefix} ${cmd_HUT_iterative} ${wdir}${fs}projects${fs}drlvm${fs}trunk${fs}build${fs}${os}_ia32_${cc}_debug${fs}deploy${fs}jdk${fs}jre drl ${HUT_forkmode} ${wdir}${fs}projects${fs}classlib${fs}trunk ${HUT_iterations}" workingdir="HUT_iterative" timeout="${HUT_iterative_timeout}" errorstr="FAILED" />
+        <exec command="${sh}"
+              args="${cmd.prefix} ${cmd_HUT_iterative} ${wdir}${fs}projects${fs}drlvm${fs}trunk${fs}build${fs}${os}_ia32_${cc}_debug${fs}deploy${fs}jdk${fs}jre drl ${HUT_forkmode} ${wdir}${fs}projects${fs}classlib${fs}trunk ${HUT_iterations}"
+              workingdir="classlib-drlvm-iterative"
+              timeout="${HUT_iterative_timeout}"
+              errorstr="FAILED" />
     </schedule>
 
     <log dir="logs/${project.name}">