You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hdfs-commits@hadoop.apache.org by sz...@apache.org on 2009/07/24 01:39:01 UTC
svn commit: r797261 - in /hadoop/hdfs/trunk: CHANGES.txt build.xml
Author: szetszwo
Date: Thu Jul 23 23:39:00 2009
New Revision: 797261
URL: http://svn.apache.org/viewvc?rev=797261&view=rev
Log:
HDFS-493. Change build.xml so that the fault-injected tests are executed only by the run-test-*-faul-inject targets. 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=797261&r1=797260&r2=797261&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Thu Jul 23 23:39:00 2009
@@ -45,6 +45,10 @@
HDFS-458. Create a new ant target, run-commit-test. (Jakob Homan
via szetszwo)
+ HDFS-493. Change build.xml so that the fault-injected tests are executed
+ only by the run-test-*-faul-inject targets. (Konstantin Boudnik via
+ szetszwo)
+
BUG FIXES
HDFS-76. Better error message to users when commands fail because of
lack of quota. Allow quota to be set even if the limit is lower than
Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=797261&r1=797260&r2=797261&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Thu Jul 23 23:39:00 2009
@@ -362,6 +362,8 @@
description="Run Fault Injection related hdfs tests">
<subant buildpath="build.xml" target="run-test-hdfs">
<property name="build.dir" value="${build-fi.dir}"/>
+ <property name="test.fault.inject" value="yes"/>
+ <property name="test.include" value="TestFi*"/>
</subant>
</target>
@@ -369,6 +371,8 @@
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>
@@ -551,6 +555,35 @@
</jar>
</target>
+ <condition property="tests.notestcase">
+ <and>
+ <isfalse value="${test.fault.inject}"/>
+ <not>
+ <isset property="testcase"/>
+ </not>
+ </and>
+ </condition>
+ <condition property="tests.notestcase.fi">
+ <and>
+ <not>
+ <isset property="testcase" />
+ </not>
+ <istrue value="${test.fault.inject}" />
+ </and>
+ </condition>
+ <condition property="tests.testcase">
+ <and>
+ <isfalse value="${test.fault.inject}" />
+ <isset property="testcase" />
+ </and>
+ </condition>
+ <condition property="tests.testcase.fi">
+ <and>
+ <istrue value="${test.fault.inject}" />
+ <isset property="testcase" />
+ </and>
+ </condition>
+
<!-- ================================================================== -->
<!-- Run unit tests -->
<!-- ================================================================== -->
@@ -586,15 +619,22 @@
<propertyref regex="fi.*"/>
</syspropertyset>
<formatter type="${test.junit.output.format}" />
- <batchtest todir="${test.build.dir}" unless="testcase">
+ <batchtest todir="${test.build.dir}" if="tests.notestcase">
<fileset dir="${test.src.dir}/hdfs" excludes="**/${test.exclude}.java">
<patternset>
<includesfile name="@{test.file}"/>
</patternset>
</fileset>
</batchtest>
- <batchtest todir="${test.build.dir}" if="testcase">
+ <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" includes="**/${testcase}.java"/>
+ </batchtest>
+ <batchtest todir="${test.build.dir}" if="tests.testcase.fi">
<fileset dir="${test.src.dir}/aop" includes="**/${testcase}.java"/>
</batchtest>
</junit>
@@ -640,14 +680,22 @@
<propertyref regex="fi.*"/>
</syspropertyset>
<formatter type="${test.junit.output.format}" />
- <batchtest todir="${test.build.dir}" unless="testcase">
+ <batchtest todir="${test.build.dir}" if="tests.notestcase">
<fileset dir="${test.src.dir}/hdfs-with-mr"
includes="**/${test.include}.java"
- excludes="**/${test.exclude}.java" />
+ excludes="**/${test.exclude}.java" />
</batchtest>
- <batchtest todir="${test.build.dir}" if="testcase">
+ <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>