harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r795862 - /harmony/enhanced/classlib/trunk/make/build-test.xml
Date Mon, 20 Jul 2009 14:41:38 GMT
Author: hindessm
Date: Mon Jul 20 14:41:38 2009
New Revision: 795862

URL: http://svn.apache.org/viewvc?rev=795862&view=rev
Log:
Remove unused targets and unused property.

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

Modified: harmony/enhanced/classlib/trunk/make/build-test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/build-test.xml?rev=795862&r1=795861&r2=795862&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/make/build-test.xml (original)
+++ harmony/enhanced/classlib/trunk/make/build-test.xml Mon Jul 20 14:41:38 2009
@@ -31,7 +31,6 @@
 
     <property name="tests.output" location="build/test_report" />
 
-    <property name="tests.build.output" location="build/tests" />
     <property name="tests.support.output" location="build/test_support" />
     <property name="support.dir" location="support"/>
     <property name="tests.depends.jars" location="deploy/jdk/jre/lib/boot" />
@@ -46,7 +45,6 @@
 
     <target name="clean">
         <delete dir="${tests.output}" />
-        <delete dir="${tests.build.output}" />
         <delete dir="${tests.support.output}" />
         <delete file="${hy.hdk}/build/test/support.jar" />
     </target>
@@ -177,99 +175,6 @@
 
     </target>
 
-    <target name="run-tests" description="Run JUnit tests">
-        <!-- The location of the Harmony launcher can be overridden by 
-             the "harmony.vm.exe" property. Default value of property
-             is set assuming it is under the deploy tree -->
-        <property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
-        
-        <!-- Delete "junitCompleted" - an empty file that can be used to
-             check that the junit test VM does not exit prematurely -->
-        <delete file="${user.home}/junitCompleted" failonerror="false" />
-
-        <path id="classpath.id" location="${tests.build.output}" />
-        
-        <java classname="tests.main.AllTests"
-              fork="true"
-              jvm="${harmony.vm.exe}">
-            
-
-            <!-- Required by various tests that set security manager etc -->
-            <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy"
/>
-
-            <!-- Required for running the java.net unit tests -->
-            <jvmarg value="-Dtest.ini.file=${support.dir}/src/test/resources/config/localhosttest.ini"
/>
-
-            <!-- Required if using the test excluder decorator -->
-            <jvmarg value="-Dexcludes.file.uri=file:///${support.dir}/src/test/resources/config/jcltest-excludes.xml"
/>
-            
-            <classpath>
-                <path refid="classpath.id" />
-                <pathelement location="${junit.jar}" />
-            </classpath>
-        </java>
-    </target>
-
-    
-    <!-- ================================= 
-          target: run-tests-with-junit-task
-         ================================= -->
-    <target name="run-tests-with-junit-task" description="Run JUnit tests">
-        <!-- The location of the Harmony launcher can be overridden by 
-             the "harmony.vm.exe" property. Default value of property
-             is set assuming it is under the deploy tree -->
-        <property name="harmony.vm.exe" location="${hy.jdk}/jre/bin/java"/>
-
-        <!-- Delete "junitCompleted" - an empty file that can be used to
-             check that the junit test VM does not exit prematurely -->
-        <delete file="${user.home}/junitCompleted" failonerror="false" />
-
-        <path id="classpath.id" location="${tests.build.output}" />
-        
-        <junit fork="true"
-               forkmode="once"
-               jvm="${harmony.vm.exe}"
-               errorproperty="tests.failed"
-               failureproperty="tests.failed">
-
-            <env key="LD_LIBRARY_PATH" value="" />
-            <!-- required to be unset on Linux -->
-
-            <!-- Required by various tests that set security manager etc -->
-            <jvmarg value="-Djava.security.policy=${hy.hdk}/build/test/testing.policy"
/>
-
-            <!-- Required for running the java.net unit tests -->
-            <jvmarg value="-Dtest.ini.file=${support.dir}/src/test/resources/config/localhosttest.ini"
/>
-
-            <!-- Required if using the test excluder decorator -->
-            <jvmarg value="-Dexcludes.file.uri=file:///${support.dir}/src/test/resources/config/jcltest-excludes.xml"
/>
-            
-            <classpath>
-                <path refid="classpath.id" />
-                <pathelement location="${junit.jar}" />
-            </classpath>
-            
-            <formatter type="plain" usefile="false" />
-            <formatter type="xml" />
-            
-            <test todir="${tests.results.dir}" name="tests.main.AllTests" />
-        </junit>
-
-        <fail if="tests.failed" message="Some Tests Failed !" />
-
-        <!-- if the junit test process completed as expected, this file
-             should now exist -->
-        <fail message="JUnit task ended prematurely - Hint: This may have been caused
by the test VM terminating unexpectedly during the test run">
-            <condition>
-                <not>
-                    <available file="${user.home}/junitCompleted" />
-                </not>
-            </condition>
-        </fail>
-        <!-- Clean up after ourselves -->
-        <delete file="${user.home}/junitCompleted" />
-    </target>
-
     <target name="process-empty" depends="-check-for-empty, -process-empty"/>
     <target name="-check-for-empty">
         <fileset id="empty.test.reports" dir="${tests.output}">



Mime
View raw message