harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r582105 - /harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml
Date Fri, 05 Oct 2007 07:45:47 GMT
Author: smishura
Date: Fri Oct  5 00:45:46 2007
New Revision: 582105

URL: http://svn.apache.org/viewvc?rev=582105&view=rev
Log:
Eclipse unit tests: fix configuring 3.3 suite on Linux 64-bits
All required properties are set in properties.file
(instead of patching 'runtests' shell script)

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=582105&r1=582104&r2=582105&view=diff
==============================================================================
--- harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml (original)
+++ harmony/enhanced/buildtest/branches/2.0/tests/eut/build.xml Fri Oct  5 00:45:46 2007
@@ -205,16 +205,10 @@
     </target>
 
     <target name="setup.configuration"
-        depends="patch.linux.x86_64,patch.runtests.display,patch.label.properties"
+        depends="patch.runtests.display,patch.label.properties"
         description="Configure EUT settings files">
     </target>
 
-    <target name="patch.linux.x86_64" if="is.linux.x86_64">
-        <replace file="${eut.work.dir}/runtests"
-            token="$vm -jar eclipse/${startup.jar} -Dosgi.ws=$ws"
-            value="$vm -jar eclipse/${startup.jar} -DsetupTarget=setup-tar.gz -DruntimeArchive=${eclipse.filename}
-Dosgi.ws=$ws"/>
-    </target>
-
     <target name="patch.runtests.display" if="is.linux">
         <replace file="${eut.work.dir}/runtests"
             token="DISPLAY="
@@ -257,7 +251,7 @@
 
     <target name="configure.properties.file"
         description="Delete old properties file and specify the path to JRE under test and
other properties"
-        depends="configure.properties.file.common,configure.properties.file.teamcvs">
+        depends="configure.properties.file.common,configure.properties.file.teamcvs,configure.properties.file.linux.x86_64">
     </target>
 
      <target name="delete.properties.file"
@@ -285,6 +279,14 @@
             jvm=${test.jre.home.path}/bin/java
             extraVMargs=${vm.options}
             timeout=${timeout}
+        </echo>
+    </target>
+
+    <target name="configure.properties.file.linux.x86_64" if="is.linux.x86_64"
+            depends="delete.properties.file" >
+        <echo file="${eut.work.dir}/properties.file" append="true">
+            setupTarget=setup-tar.gz
+            runtimeArchive=${eclipse.filename}
         </echo>
     </target>
 



Mime
View raw message