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/08/31 13:18:16 UTC

svn commit: r571431 - /harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml

Author: smishura
Date: Fri Aug 31 04:18:15 2007
New Revision: 571431

URL: http://svn.apache.org/viewvc?rev=571431&view=rev
Log:
Simplify JDKTools adaptor: replace 'exec-ant' with ant task

Modified:
    harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml

Modified: harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml?rev=571431&r1=571430&r2=571431&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/adaptors/jdktools-test/adaptor.xml Fri Aug 31 04:18:15 2007
@@ -18,7 +18,7 @@
 <project name="jdktools-test" default="run" basedir=".">
 
     <!-- On 64-bit platform tests should be run in interpreter mode only -->
-    <condition property="is.x86_64" value="-Dhy.test.vmargs=-Xint" else="">
+    <condition property="is.x86_64" value="-Xint" else="">
         <or>
             <equals arg1="x86_64" arg2="${os.arch}" />
             <equals arg1="amd64" arg2="${os.arch}" />
@@ -28,12 +28,12 @@
     <property name="tests.results.dir" value="${built.trunk.dir}/build/test_report"/>
 
     <target name="run" depends="-setup-jdktools-ws,-update-jdktools-ws">
-        <exec-ant targets="test" dir="${built.trunk.dir}">
-            <jvmarg line="${is.x86_64}"/>
-            <sysproperty key="exclude.interm" value="true"/>
-            <sysproperty key="test.jre.home" value="${tested.jre}"/>
-            <sysproperty key="hy.test.timeout" value="6000000"/>
-        </exec-ant>
+        <ant target="test" dir="${built.trunk.dir}">
+            <property name="hy.test.vmargs" value="${is.x86_64}" />
+            <property name="exclude.interm" value="true" />
+            <property name="test.jre.home" value="${tested.jre}" />
+            <property name="hy.test.timeout" value="6000000" />
+        </ant>
     </target>
 
     <!--                                                    -->