harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From var...@apache.org
Subject svn commit: r495194 - in /harmony/enhanced/drlvm/trunk/build/make/targets: cunit.test.xml jvmti.test.xml kernel.test.xml smoke.test.xml test.xml
Date Thu, 11 Jan 2007 11:20:30 GMT
Author: varlax
Date: Thu Jan 11 03:20:29 2007
New Revision: 495194

URL: http://svn.apache.org/viewvc?view=rev&rev=495194
Log:
Fixed HARMONY-2859 [drlvm][build] tests continue run after test failure.

Modified:
    harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
    harmony/enhanced/drlvm/trunk/build/make/targets/test.xml

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml?view=diff&rev=495194&r1=495193&r2=495194
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/cunit.test.xml Thu Jan 11 03:20:29 2007
@@ -149,6 +149,9 @@
                 </cc>
             </sequential>
         </for>
+        
+        <delete file="${build.semi.dir}/cunit.test.failed" failonerror="false" />
+            
         <for list="${unit.test.c.files}" param="file" delimiter=",">
             <sequential>
                 <!-- make it possible to overwrite the property -->
@@ -180,8 +183,9 @@
                         <equals arg1="${resultproperty}" arg2="0" />
                     </not>
                     <then>
-                        <property name="some.test.failed" value="true" />
+                        <property name="test.failed" value="true" />
                         <echo message="## TEST FAILED" />
+                        <echo file="${build.semi.dir}/cunit.test.failed" message="${filename}
FAILED${line.separator}" append="true"/>
                     </then>
                     <else>
                         <echo message="## TEST PASSED" />
@@ -189,14 +193,8 @@
                 </if>
             </sequential>
         </for>
-        <if>
-            <isset property="some.test.failed" />
-            <then>
-                <echo message="## Please find tests and results at ${build.dir}/_cunit.tests/"
/>
-                <fail message="## SOME TESTS FAILED" />
-            </then>
-        </if>
+
         <echo message="## Please find tests and results at ${build.dir}/_cunit.tests/"
/>
-        <echo message="## TESTS PASSED" />
+        <fail unless="run.all.tests" if="test.failed" message="## SOME TESTS FAILED"/>
     </target>
 </project>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml?view=diff&rev=495194&r1=495193&r2=495194
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/jvmti.test.xml Thu Jan 11 03:20:29 2007
@@ -112,9 +112,7 @@
         </if>
 
         <delete quiet="true" dir="${jvmti.test.dir}/reports" />
-        <delete quiet="true" dir="${jvmti.test.dir}/ref-reports" />
         <mkdir dir="${jvmti.test.dir}/reports" />
-        <mkdir dir="${jvmti.test.dir}/ref-reports" />
     </target>
 
     <target name="run-jvmti-tests">
@@ -155,12 +153,19 @@
                     <classpath path="${jvmti.test.class.path}" />
                     <test name="${testname}.${testname}" todir="${report.dir}" />
                 </junit>
-                <fail if="${testname}.failed" />
+                <if>
+                    <isset property="${testname}.failed" />
+                    <then>
+                        <echo file="${build.semi.dir}/jvmti.test.failed" message="${testname}
failed on ${jvmti.tests.mode}${line.separator}" append="true"/>
+                    </then>
+                </if>
+
             </sequential>
         </for>
     </target>
 
     <target name="jvmti.test" depends="pre-jvmti-test">
+        <delete file="${build.semi.dir}/jvmti.test.failed" failonerror="false" />
         <if>
             <equals arg1="${build.arch}" arg2="ia32" />
             <then>
@@ -175,5 +180,8 @@
                 </antcall>
             </then>
         </if>
+        
+        <available property="test.failed" file="${build.semi.dir}/jvmti.test.failed" />
+        <fail unless="run.all.tests" if="test.failed" message="Some tests failed"/>
     </target>
 </project>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml?view=diff&rev=495194&r1=495193&r2=495194
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/kernel.test.xml Thu Jan 11 03:20:29 2007
@@ -86,10 +86,10 @@
         <echo message="${line.separator}"/>
         <echo>Please find detailed results under ${kernel.test.dir}/reports directory.</echo>
         
-        <condition property="kernel.failures">
+        <condition property="test.failed">
             <contains string="${kernel.test.summary}" substring="FAILED" />
         </condition>
-        <fail if="kernel.failures" message="There were test failures." />
+        <fail unless="run.all.tests" if="test.failed" message="There were test failures."/>
     </target>
        
     <target name="compile-kernel-test">

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml?view=diff&rev=495194&r1=495193&r2=495194
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/smoke.test.xml Thu Jan 11 03:20:29 2007
@@ -43,14 +43,12 @@
     </target>
 
     <target name="smoke.test" depends="clean, compile.smoke.test, java_test_smoke, build_report">
-        <!-- workaround: setting property doesn't work because of antcall  -->
-        <!-- have to touch file if tests fail and verify if it exists here -->
-        <available property="tests.failed" file="tests.failed" />
-        <fail if="tests.failed"/>
+        <available property="test.failed" file="${build.semi.dir}/smoke.test.failed" />
+        <fail unless="run.all.tests" if="test.failed"/>
     </target>
 
     <target name="clean">
-        <delete file="tests.failed"/>
+        <delete file="${build.semi.dir}/smoke.test.failed"/>
     </target>
 
     <target name="compile.smoke.test" depends="compile.smoke.test.java, compile.smoke.test.native"
/>
@@ -305,8 +303,8 @@
                                 <replace file="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.xml"
token="@@@@@" value="${class.name}_${jit.or.interpreter}" /> 
                             </then>
                             <else>
-                                <touch file="tests.failed"/>
                                 <echo message="*** FAILED **** : ${class.name}" />
+                                <echo message="*** FAILED **** : ${class.name} on ${jit.or.interpreter}${line.separator}"
file="${build.semi.dir}/smoke.test.failed" append="true"/>
 
                                 <!-- create xml-file with test's results -->
 <echo file="${build.dir}/_smoke.tests/reports/${class.name}_${jit.or.interpreter}.xml"><![CDATA[<?xml
version="1.0" encoding="UTF-8" ?>

Modified: harmony/enhanced/drlvm/trunk/build/make/targets/test.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/build/make/targets/test.xml?view=diff&rev=495194&r1=495193&r2=495194
==============================================================================
--- harmony/enhanced/drlvm/trunk/build/make/targets/test.xml (original)
+++ harmony/enhanced/drlvm/trunk/build/make/targets/test.xml Thu Jan 11 03:20:29 2007
@@ -13,15 +13,16 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<!--
-Author:  Marina V. Goldburt
--->
 <project name="ALL TESTS">
     <select arch="ipf">
-        <target name="test" depends="smoke.test" />
+        <target name="test" depends="smoke.test, check-result"/>
     </select>
     <select arch="ia32,em64t">
-        <target name="test" depends="jvmti.test, cunit.test, smoke.test, kernel.test"
/>
+        <target name="test" depends="jvmti.test, cunit.test, smoke.test, kernel.test,
check-result"/>
     </select>
+    
+    <target name="check-result">
+        <fail if="test.failed" message="Some tests failed"/>
+    </target>
 </project>
 



Mime
View raw message