harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r520852 - in /harmony/enhanced/buildtest/trunk/modules: classlib-drlvm/project.template drlvm-test/project.template drlvm/project.template
Date Wed, 21 Mar 2007 12:14:16 GMT
Author: smishura
Date: Wed Mar 21 05:14:15 2007
New Revision: 520852

URL: http://svn.apache.org/viewvc?view=rev&rev=520852
Log:
Apply slightly modified patch that fixes projects configuration templates from HARMONY-3115:
([testing][buildtest module] the structure of buildtest module should be changed a little
bit to improve testing capabilities)

Modified:
    harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/project.template
    harmony/enhanced/buildtest/trunk/modules/drlvm-test/project.template
    harmony/enhanced/buildtest/trunk/modules/drlvm/project.template

Modified: harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/project.template
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/project.template?view=diff&rev=520852&r1=520851&r2=520852
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/project.template (original)
+++ harmony/enhanced/buildtest/trunk/modules/classlib-drlvm/project.template Wed Mar 21 05:14:15
2007
@@ -23,14 +23,20 @@
     </listeners>
 
     <modificationset quietperiod="60">
-        <buildstatus logdir="logs/classlib"/>
-        <svn localWorkingCopy="${classlib}"/>
-        <svn localWorkingCopy="${drlvm}"/>
+        <compound includeTriggerChanges="false">
+            <triggers>
+                <buildstatus logdir="logs/drlvm"/>
+            </triggers>
+            <targets>
+                <svn localWorkingCopy="${drlvm}"/>
+                <svn localWorkingCopy="${classlib}"/>
+            </targets>
+        </compound>
     </modificationset>
 
     <schedule interval="${timeout}">
         <ant target="test" antWorkingDir="${classlib}" timeout="${ttimeout}" usedebug="false">
-            <jvmarg arg="-Dtest.jre.home=${wdir}/projects/drlvm/trunk/build/${os}_${build_arch}_${cc}_${build_cfg}/deploy/jdk/jre"
/>
+            <jvmarg arg="-Dtest.jre.home=${wdir}/${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/deploy/jdk/jre"
/>
             <jvmarg arg="-Dhy.test.vm.name=${tested.vm.name}" />
             <jvmarg arg="-Xmx700M" />
         </ant>

Modified: harmony/enhanced/buildtest/trunk/modules/drlvm-test/project.template
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/drlvm-test/project.template?view=diff&rev=520852&r1=520851&r2=520852
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/drlvm-test/project.template (original)
+++ harmony/enhanced/buildtest/trunk/modules/drlvm-test/project.template Wed Mar 21 05:14:15
2007
@@ -23,8 +23,14 @@
     </listeners>
 
     <modificationset quietperiod="60">
-        <buildstatus logdir="logs/drlvm"/>
-        <svn localWorkingCopy="${drlvm}"/>
+        <compound includeTriggerChanges="false">
+            <triggers>
+                <buildstatus logdir="logs/drlvm"/>
+            </triggers>
+            <targets>
+                <svn localWorkingCopy="${drlvm}"/>
+            </targets>
+        </compound>
     </modificationset>
 
     <schedule interval="${timeout}">
@@ -36,16 +42,19 @@
             <jvmarg arg="-DBUILD_CFG=${build_cfg}" />
             <jvmarg arg="-DCXX=${cc}" />
             <jvmarg arg="-Drun.all.tests=true" />
+            <jvmarg arg="-Dtest.mode=jit,jet,opt,int" />
         </ant>
     </schedule>
 
     <log dir="logs/${project.name}">
         <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/jvmti.tests/reports/int"
pattern="TEST-*.xml" />
         <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/jvmti.tests/reports/jet"
pattern="TEST-*.xml" />
+        <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/jvmti.tests/reports/jit"
pattern="TEST-*.xml" />
         <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/jvmti.tests/reports/opt"
pattern="TEST-*.xml" />
         <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/vm/_cunit.tests/report"
pattern="TEST-*.xml" />
         <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/vm/_smoke.tests/reports"
pattern="TEST-*.xml" />
         <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/jet.mode"
pattern="TEST-*.xml" />
+        <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/jit.mode"
pattern="TEST-*.xml" />
         <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/opt.mode"
pattern="TEST-*.xml" />
         <merge dir="${drlvm}/build/${os}_${build_arch}_${cc}_${build_cfg}/semis/kernel.tests/reports/int.mode"
pattern="TEST-*.xml" />
     </log>

Modified: harmony/enhanced/buildtest/trunk/modules/drlvm/project.template
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/modules/drlvm/project.template?view=diff&rev=520852&r1=520851&r2=520852
==============================================================================
--- harmony/enhanced/buildtest/trunk/modules/drlvm/project.template (original)
+++ harmony/enhanced/buildtest/trunk/modules/drlvm/project.template Wed Mar 21 05:14:15 2007
@@ -20,21 +20,31 @@
 
 <project name="drlvm">
 
+    <bootstrappers>
+        <svnbootstrapper localWorkingCopy="${drlvm}" />
+    </bootstrappers>
+
     <listeners>
         <currentbuildstatuslistener file="logs/${project.name}/status.txt" />
     </listeners>
 
     <modificationset quietperiod="60">
-        <buildstatus logdir="logs/classlib"/>
-        <svn localWorkingCopy="projects/drlvm/trunk"/>
-        <svn localWorkingCopy="projects/classlib/trunk"/>
+        <compound includeTriggerChanges="false">
+            <triggers>
+                <buildstatus logdir="logs/classlib"/>
+            </triggers>
+            <targets>
+                <svn localWorkingCopy="${drlvm}"/>
+                <svn localWorkingCopy="${classlib}"/>
+            </targets>
+        </compound>
     </modificationset>
 
     <schedule interval="${timeout}">
-        <ant target="update clean build" antWorkingDir="projects/${project.name}/trunk/build/make"
timeout="${ttimeout}" usedebug="false">
+        <ant target="update clean build" antWorkingDir="${drlvm}/build/make" timeout="${ttimeout}"
usedebug="false">
             <jvmarg arg="-D${proxy.host.vm}=${proxy.value}"/>
             <jvmarg arg="-D${proxy.port.vm}=${port.value}"/>
-            <jvmarg arg="-Dexternal.dep.CLASSLIB.loc=${wdir}/projects/classlib/trunk"
/>
+            <jvmarg arg="-Dexternal.dep.CLASSLIB.loc=${wdir}/${classlib}" />
             <jvmarg arg="-Dbuild.arch=${build_arch}" />
         </ant>
     </schedule>



Mime
View raw message