harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r545756 - in /harmony/enhanced/drlvm/trunk/build/make: build.xml targets/reg.test.run.xml
Date Sat, 09 Jun 2007 14:42:48 GMT
Author: varlax
Date: Sat Jun  9 07:42:48 2007
New Revision: 545756

URL: http://svn.apache.org/viewvc?view=rev&rev=545756
Log:
Minor improvements to build scripts

Modified:
    harmony/enhanced/drlvm/trunk/build/make/build.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/build.xml?view=diff&rev=545756&r1=545755&r2=545756
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/build.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/build.xml Sat Jun  9 07:42:48 2007
@@ -445,10 +445,9 @@
 
     <!-- Main target to run smoke tests -->
     <target name="smoke.test" depends="setup, init">
-        <property name="target" value="smoke.test" />
         <subant buildpath="." antfile="build_component.xml" target="build" inheritall="true"
failonerror="true">
             <property name="_component" value="vm" />
-            <property name="_target" value="${target}" />
+            <property name="_target" value="smoke.test" />
         </subant>
     </target>
 
@@ -464,16 +463,10 @@
 
     <!-- Main target to run jvmti tests /-->
     <target name="jvmti.test" depends="setup, init">
-        <!-- <if>
-            <equals arg1="${build.arch}" arg2="ia32" />
-            <then> -->
-                <property name="target" value="jvmti.test" />
-                <subant buildpath="." antfile="build_component.xml" target="build" inheritall="true"
failonerror="true">
-                    <property name="_component" value="vm" />
-                    <property name="_target" value="${target}" />
-                </subant>
-            <!-- </then>
-        </if> -->
+        <subant buildpath="." antfile="build_component.xml" target="build" inheritall="true"
failonerror="true">
+            <property name="_component" value="vm" />
+            <property name="_target" value="jvmti.test" />
+        </subant>
     </target>
 
     <!-- Main target to run regression test /-->

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml?view=diff&rev=545756&r1=545755&r2=545756
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/reg.test.run.xml Sat Jun  9 07:42:48 2007
@@ -177,6 +177,7 @@
                    dir="${basedir}"
                    failureproperty="reg.test.errors"
                    timeout="${reg.test.timeout}">
+                <jvmarg value="-XX:-vm.assert_dialog" />
                 <jvmarg line="@{vmarg}"/>
                 <test name="@{test}" todir="${reg.test.dir}/reports"/>
                 <classpath>
@@ -209,7 +210,6 @@
             <run-junit-test test="@{test}" vmarg="@{vmarg}">
                 <junit-element>
                     <jvmti-junit-element/>
-                    <jvmarg value="-Dvm.assert_dialog=0" />
                     <jvmarg
                         value="-agentpath:${reg.test.2launch.native.path}/${lib.prefix}@{agent}${lib.suffix}"
                         />
@@ -235,6 +235,7 @@
                   fork="yes"
                   timeout="${reg.test.timeout}">
                 <java-element/>
+                <jvmarg value="-XX:-vm.assert_dialog" />
                 <jvmarg line="@{vmarg}" />
                 <arg line="@{args}" />
                 <classpath>



Mime
View raw message