Author: szetszwo
Date: Wed Sep 9 20:17:50 2009
New Revision: 813101
URL: http://svn.apache.org/viewvc?rev=813101&view=rev
Log:
HDFS-605. Do not run fault injection tests in the run-test-hdfs-with-mr 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=813101&r1=813100&r2=813101&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Wed Sep 9 20:17:50 2009
@@ -220,6 +220,9 @@
HADOOP-6243. Fixed a NullPointerException in handling deprecated keys.
(Sreekanth Ramakrishnan via yhemanth)
+ HDFS-605. Do not run fault injection tests in the run-test-hdfs-with-mr
+ target. (Konstantin Boudnik via szetszwo)
+
Release 0.20.1 - Unreleased
IMPROVEMENTS
Modified: hadoop/hdfs/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=813101&r1=813100&r2=813101&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Wed Sep 9 20:17:50 2009
@@ -378,15 +378,6 @@
</subant>
</target>
- <target name="run-test-hdfs-with-mr-fault-inject" depends="injectfaults"
- description="Run hdfs Fault Injection related unit tests that
require mapred">
- <subant buildpath="build.xml" target="run-test-hdfs-with-mr">
- <property name="build.dir" value="${build-fi.dir}"/>
- <property name="test.fault.inject" value="yes"/>
- <property name="test.include" value="TestFi*"/>
- </subant>
- </target>
-
<!-- ================================================================== -->
<!-- Make hadoop-fi.jar including all Fault Iinjected artifacts -->
<!-- ================================================================== -->
@@ -702,17 +693,9 @@
includes="**/${test.include}.java"
excludes="**/${test.exclude}.java" />
</batchtest>
- <batchtest todir="${test.build.dir}" if="tests.notestcase.fi">
- <fileset dir="${test.src.dir}/aop"
- includes="**/${test.include}.java"
- excludes="**/${test.exclude}.java" />
- </batchtest>
<batchtest todir="${test.build.dir}" if="tests.testcase">
<fileset dir="${test.src.dir}/hdfs-with-mr"
includes="**/${testcase}.java"/>
</batchtest>
- <batchtest todir="${test.build.dir}" if="tests.testcase.fi">
- <fileset dir="${test.src.dir}/aop" includes="**/${testcase}.java"/>
- </batchtest>
</junit>
<antcall target="checkfailure"/>
</target>
@@ -737,7 +720,6 @@
<antcall target="run-test-hdfs"/>
<antcall target="run-test-hdfs-with-mr"/>
<antcall target="run-test-hdfs-fault-inject"/>
- <antcall target="run-test-hdfs-with-mr-fault-inject"/>
<available file="${test.build.dir}/testsfailed" property="testsfailed"/>
<fail if="testsfailed">Tests failed!</fail>
</target>
