svn commit: r1079072 - in /hadoop/mapreduce/trunk: CHANGES.txt build.xml

[to...@apache.org]

Author: todd
Date: Tue Mar  8 01:35:23 2011
New Revision: 1079072

URL: http://svn.apache.org/viewvc?rev=1079072&view=rev
Log:
MAPREDUCE-2367. Allow using a file to exclude certain tests from build. Contributed by Todd Lipcon.

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

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=1079072&r1=1079071&r2=1079072&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Tue Mar  8 01:35:23 2011
@@ -60,6 +60,9 @@ Trunk (unreleased changes)
     MAPREDUCE-2331. Add coverage of task graph servlet to fair scheduler system
     test. (todd)
 
+    MAPREDUCE-2367. Allow using a file to exclude certain tests from build.
+    (todd)
+
   OPTIMIZATIONS
     
     MAPREDUCE-2026. Make JobTracker.getJobCounters() and

Modified: hadoop/mapreduce/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/build.xml?rev=1079072&r1=1079071&r2=1079072&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/build.xml (original)
+++ hadoop/mapreduce/trunk/build.xml Tue Mar  8 01:35:23 2011
@@ -123,6 +123,7 @@
   <property name="test.mapred.commit.tests.file" value="${test.src.dir}/commit-tests" />
   <property name="test.mapred.smoke.tests.file" value="${test.src.dir}/smoke-tests" />
   <property name="test.mapred.all.tests.file" value="${test.src.dir}/all-tests" />
+  <property name="test.exclude.file" value="/dev/null" />
 
   <property name="librecordio.test.dir" value="${test.build.dir}/librecordio"/>
   <property name="web.src.dir" value="${basedir}/src/web"/>
@@ -719,6 +720,7 @@
             excludes="**/${test.exclude}.java aop/** system/**">
             <patternset>
               <includesfile name="@{test.file}"/>
+              <excludesfile name="${test.exclude.file}" />
             </patternset>
             <patternset refid="@{exclude.list.id}"/>
           </fileset>
@@ -733,7 +735,8 @@
         <batchtest todir="@{test.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>
         <!-- batch test for testing a single test case in aop folder with
         fault injection-->