harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r938209 - /harmony/enhanced/java/branches/mrh/build.xml
Date Mon, 26 Apr 2010 19:50:03 GMT
Author: hindessm
Date: Mon Apr 26 19:50:02 2010
New Revision: 938209

URL: http://svn.apache.org/viewvc?rev=938209&view=rev
Log:
Fix test target - still need to move samsa tests to the hdk.

Modified:
    harmony/enhanced/java/branches/mrh/build.xml

Modified: harmony/enhanced/java/branches/mrh/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/build.xml?rev=938209&r1=938208&r2=938209&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/build.xml (original)
+++ harmony/enhanced/java/branches/mrh/build.xml Mon Apr 26 19:50:02 2010
@@ -820,48 +820,20 @@ harmony.java.version=${harmony.java.vers
         <chmod file="${target.dir}/src/debian/rules" perm="ugo+x" />
     </target>
 
-    <target name="test"
-            depends="test-classlib,test-jdktools,process-test-output" />
-
-    <target name="clean-tests">
-        <delete dir="target/test_report" />
-    </target>
-
-    <target name="test-classlib" depends="clean-tests">
-        <ant antfile="classlib/make/build-test.xml"
-             target="test-modules" inheritAll="false" >
-            <propertyset refid="required.props" />
-            <property name="svn.info" value="${harmony.long.version}"/>
-            <property name="svn.revision" value="${harmony.version}"/>
-            <property name="keep.working" value="true" />
-            <property name="tests.output" location="target/test_report" />
-            <property name="test.jre.home" location="target/hdk/jdk/jre" />
-        </ant>
-    </target>
-
-    <target name="test-jdktools" depends="clean-tests">
-        <ant antfile="jdktools/build.xml"
-             target="-test-modules" inheritAll="false" >
+    <target name="test" depends="clean-tests">
+        <ant antfile="target/hdk/build/test/build.xml"
+             target="test" inheritAll="false" >
             <propertyset refid="required.props" />
             <property name="svn.info" value="${harmony.long.version}"/>
             <property name="svn.revision" value="${harmony.version}"/>
-            <property name="common.resources" location="common_resources" />
             <property name="keep.working" value="true" />
             <property name="tests.output" location="target/test_report" />
             <property name="test.jre.home" location="target/hdk/jdk/jre" />
         </ant>
     </target>
 
-    <target name="process-test-output">
-        <ant antfile="target/hdk/build/test/build.xml"
-             target="check-test-result" inheritAll="false" >
-            <propertyset refid="required.props" />
-            <property name="svn.info" value="${harmony.long.version}"/>
-            <property name="svn.revision" value="${harmony.version}"/>
-            <property name="keep.working" value="true" />
-            <property name="tests.output" location="target/test_report" />
-            <property name="test.jre.home" location="target/hdk/jdk/jre" />
-        </ant>
+    <target name="clean-tests">
+        <delete dir="target/test_report" />
     </target>
 
     <!-- ============================================================== -->



Mime
View raw message