Author: cos
Date: Thu Dec 23 05:17:10 2010
New Revision: 1052169

URL: http://svn.apache.org/viewvc?rev=1052169&view=rev
Log:
HDFS-1548. Fault-injection tests are executed multiple times if invoked with run-test-hdfs-fault-inject target. Contributed by Konstantin Boudnik.


Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/build.xml

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=1052169&r1=1052168&r2=1052169&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Thu Dec 23 05:17:10 2010
@@ -488,6 +488,9 @@ Release 0.21.1 - Unreleased
 
     HDFS-1206. TestFiHFlush fails intermittently. (cos)
 
+    HDFS-1548. Fault-injection tests are executed multiple times if invoked
+    with run-test-hdfs-fault-inject target (cos)
+
 Release 0.21.0 - 2010-08-13
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=1052169&r1=1052168&r2=1052169&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Thu Dec 23 05:17:10 2010
@@ -482,9 +482,19 @@
   <target name="jar-test-fault-inject" depends="jar-hdfs-test-fault-inject"
           description="Make hadoop-test.jar files"/>
 
-  <target name="run-test-hdfs-fault-inject" depends="injectfaults" 
+  <target name="run-test-hdfs-fault-inject" depends="injectfaults,
+    -run-test-hdfs-fault-inject-all,
+    -run-test-hdfs-fault-inject-withtestcaseonly"
 	  description="Run full set of the unit tests with fault injection">
-    <macro-run-tests-fault-inject target.name="run-test-hdfs"
+  </target>
+  <target name="-run-test-hdfs-fault-inject-all" unless="testcase">
+    <macro-run-tests-fault-inject
+      target.name="run-test-hdfs-excluding-commit-and-smoke"
+      testcasesonly="false"/>
+  </target>
+  <target name="-run-test-hdfs-fault-inject-withtestcaseonly" if="testcase">
+    <macro-run-tests-fault-inject
+      target.name="run-test-hdfs-all-withtestcaseonly"
       testcasesonly="false"/>
   </target>
 
@@ -511,7 +521,8 @@
   <target name="run-fault-inject-with-testcaseonly" depends="injectfaults">
     <fail unless="testcase">Can't run this target without -Dtestcase setting!
     </fail>
-    <macro-run-tests-fault-inject target.name="run-test-hdfs" 
+    <macro-run-tests-fault-inject
+      target.name="run-test-hdfs-all-withtestcaseonly"
       testcasesonly="true"/>
   </target>
   <!-- ================================================================== -->