Author: todd
Date: Tue Mar 8 01:33:52 2011
New Revision: 1079071
URL: http://svn.apache.org/viewvc?rev=1079071&view=rev
Log:
HADOOP-7167. Allow using a file to exclude certain tests from build.
Contributed by Todd Lipcon.
Modified:
hadoop/common/trunk/CHANGES.txt
hadoop/common/trunk/build.xml
Modified: hadoop/common/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/CHANGES.txt?rev=1079071&r1=1079070&r2=1079071&view=diff
==============================================================================
--- hadoop/common/trunk/CHANGES.txt (original)
+++ hadoop/common/trunk/CHANGES.txt Tue Mar 8 01:33:52 2011
@@ -69,6 +69,8 @@ Trunk (unreleased changes)
HADOOP-7159. RPC server should log the client hostname when read exception
happened. (Scott Chen via todd)
+ HADOOP-7167. Allow using a file to exclude certain tests from build. (todd)
+
OPTIMIZATIONS
BUG FIXES
Modified: hadoop/common/trunk/build.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/trunk/build.xml?rev=1079071&r1=1079070&r2=1079071&view=diff
==============================================================================
--- hadoop/common/trunk/build.xml (original)
+++ hadoop/common/trunk/build.xml Tue Mar 8 01:33:52 2011
@@ -95,6 +95,7 @@
<property name="test.core.build.classes"
value="${test.build.dir}/core/classes"/>
<property name="test.all.tests.file" value="${test.src.dir}/all-tests"/>
+ <property name="test.exclude.file" value="/dev/null" />
<property name="javadoc.link.java"
value="http://java.sun.com/javase/6/docs/api/"/>
@@ -770,13 +771,15 @@
excludes="**/${test.exclude}.java aop/** system/**">
<patternset>
<includesfile name="@{test.file}"/>
+ <excludesfile name="${test.exclude.file}"/>
</patternset>
</fileset>
</batchtest>
<batchtest todir="${test.build.dir}" if="tests.notestcase.fi">
<fileset dir="@{fileset.dir}/aop"
includes="**/${test.include}.java"
- excludes="**/${test.exclude}.java" />
+ excludes="**/${test.exclude}.java"
+ excludesfile="${test.exclude.file}" />
</batchtest>
<batchtest todir="@{test.dir}" if="tests.testcase">
<fileset dir="@{fileset.dir}/core"
