Forráskód Böngészése

HADOOP-6506. Failing tests prevent the rest of test targets from execution. Contributed by Konstantin Boudnik.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20@904225 13f79535-47bb-0310-9956-ffa450edef68
Konstantin Boudnik 15 éve
szülő
commit
b9f6a61741
2 módosított fájl, 19 hozzáadás és 3 törlés
  1. 3 0
      CHANGES.txt
  2. 16 3
      build.xml

+ 3 - 0
CHANGES.txt

@@ -100,6 +100,9 @@ Release 0.20.2 - Unreleased
     HADOOP-6498. IPC client bug may cause rpc call hang. (Ruyue Ma and
     hairong via hairong)
 
+    HADOOP-6596. Failing tests prevent the rest of test targets from
+    execution. (cos)
+
 Release 0.20.1 - 2009-09-01
 
   INCOMPATIBLE CHANGES

+ 16 - 3
build.xml

@@ -704,6 +704,7 @@
   <!-- ================================================================== -->
   <target name="test-core" depends="jar-test" description="Run core unit tests">
 
+    <delete file="${test.build.dir}/testsfailed"/>
     <delete dir="${test.build.data}"/>
     <mkdir dir="${test.build.data}"/>
     <delete dir="${test.log.dir}"/>
@@ -747,9 +748,14 @@
         <fileset dir="${test.src.dir}" includes="**/${testcase}.java"/>
       </batchtest>
     </junit>
-    <fail if="tests.failed">Tests failed!</fail>
+    <antcall target="checkfailure"/>
   </target>   
 
+  <target name="checkfailure" if="tests.failed">
+    <touch file="${test.build.dir}/testsfailed"/>
+    <fail unless="continueOnFailure">Tests failed!</fail>
+  </target>
+
   <target name="test-contrib" depends="compile, compile-core-test" description="Run contrib unit tests">
     <subant target="test">
        <property name="version" value="${version}"/>
@@ -757,8 +763,15 @@
     </subant> 
   </target>
 	  
-  <target name="test" depends="test-core, test-contrib" description="Run core, contrib unit tests">
-  </target>
+  <target name="test" description="Run core, contrib, fault injection tests">
+    <delete file="${test.build.dir}/testsfailed"/>
+    <property name="continueOnFailure" value="true"/>
+    <antcall target="test-core"/>
+    <antcall target="test-contrib"/>
+    <antcall target="run-test-core-fault-inject"/>
+    <available file="${test.build.dir}/testsfailed" property="testsfailed"/>
+    <fail if="testsfailed">Tests failed!</fail>
+  </target>  
 
   <!-- Run all unit tests, not just Test*, and use non-test configuration. -->
   <target name="test-cluster" description="Run all unit tests, not just Test*, and use non-test configuration.">