svn commit: r535240 - /harmony/enhanced/jdktools/trunk/make/build-test.xml

[te...@apache.org]

Author: tellison
Date: Fri May  4 06:52:44 2007
New Revision: 535240

URL: http://svn.apache.org/viewvc?view=rev&rev=535240
Log:
Apply patch HARMONY-3803 ([jdktools][build] no exectution permission for java launcher while copying JRE for testing)

Modified:
    harmony/enhanced/jdktools/trunk/make/build-test.xml

Modified: harmony/enhanced/jdktools/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/jdktools/trunk/make/build-test.xml?view=diff&rev=535240&r1=535239&r2=535240
==============================================================================
--- harmony/enhanced/jdktools/trunk/make/build-test.xml (original)
+++ harmony/enhanced/jdktools/trunk/make/build-test.xml Fri May  4 06:52:44 2007
@@ -41,14 +41,19 @@
 
     <!-- this list of components to test will grow to eventually be all modules -->
     <target name="test-all"
-        depends="clean, test-modules, gen-report, check-test-result">
+        depends="clean-tests-output, test-modules, gen-report, check-test-result">
     </target>
 
-    <target name="clean">
-        <delete dir="${tests.output}" />
+    <target name="clean" depends="clean-tests-output, clean-tests, clean-jre" />
+
+    <target name="clean-tests">
         <delete dir="${tests.build.output}" />
     </target>
 
+    <target name="clean-tests-output">
+        <delete dir="${tests.output}" />
+    </target>
+
     <target name="test-modules" depends="copy-jre" >
         <mkdir dir="${tests.output}" />
         <mkdir dir="${tests.build.output}" />
@@ -93,10 +98,20 @@
         <fail if="test.failures" message="There were test failures." />
     </target>
 
-    <target name="copy-jre" unless="not.copy.jre">
+    <target name="copy-jre" depends="copy-jre-files, chmod-jre-files" unless="not.copy.jre"/>
+
+    <target name="copy-jre-files">
         <copy todir="${hy.jdk}/jre" overwrite="no">
               <fileset dir="${hy.deploy}/jdk/jre" />
         </copy>
+    </target>
+
+    <target name="chmod-jre-files" if="is.unix">
+        <chmod file="${hy.jdk}/jre/bin/java" perm="ugo+x" />
+    </target>
+
+    <target name="clean-jre">
+        <delete dir="${hy.jdk}/jre" />
     </target>
 
 </project>