harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r578453 - /harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml
Date Sat, 22 Sep 2007 14:55:07 GMT
Author: smishura
Date: Sat Sep 22 07:55:06 2007
New Revision: 578453

URL: http://svn.apache.org/viewvc?rev=578453&view=rev
Log:
Apply patch that set 'jvm' property for test.xml
See HARMONY-4832:
([buildtest][eut] text.xml should be patched with J2SE-5.0 to run EUT3.3 on Harmony)

Modified:
    harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml

Modified: harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml?rev=578453&r1=578452&r2=578453&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml Sat Sep 22 07:55:06 2007
@@ -205,7 +205,7 @@
     </target>
 
     <target name="setup.configuration"
-        depends="patch.linux.x86_64,patch.runtests.display,patch.label.properties,patch.test.xml"
+        depends="patch.linux.x86_64,patch.runtests.display,patch.label.properties"
         description="Configure EUT settings files">
     </target>
 
@@ -228,16 +228,6 @@
         </echo>
     </target>
 
-    <!-- EUT32 specific replacement... -->
-    <target name="patch.test.xml" if="is.eut32"
-        description="Modify EUT test.xml configuration file to always use J2SE-5.0">
-        <replace file="${eut.work.dir}/test.xml">
-            <replacetoken><![CDATA[<param name="testPlugin"]]></replacetoken>
-            <replacevalue><![CDATA[<param name="jvm" value="${J2SE-5.0}" />
-            <param name="testPlugin"]]></replacevalue>
-        </replace>
-    </target>
-
     <target name="build.reporter"
         description="Build summary reporter classes">
         <mkdir dir="${work.dir}/summary-reporter/classes"/>
@@ -291,6 +281,7 @@
         <delete file="${eut.work.dir}/properties.file" failonerror="false"/>
         <echo file="${eut.work.dir}/properties.file" append="true">
             J2SE-5.0=${test.jre.home.path}/bin/java
+            jvm=${test.jre.home.path}/bin/java
             extraVMargs=${vm.options}
             timeout=${timeout}
         </echo>



Mime
View raw message