svn commit: r1079069 - in /hadoop/hdfs/trunk: CHANGES.txt build.xml

[to...@apache.org]

Author: todd
Date: Tue Mar  8 01:32:40 2011
New Revision: 1079069

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

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=1079069&r1=1079068&r2=1079069&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Tue Mar  8 01:32:40 2011
@@ -61,6 +61,8 @@ Trunk (unreleased changes)
     HDFS-1628. Display full path in AccessControlException.  (John George
     via szetszwo)
 
+    HDFS-1731. Allow using a file to exclude certain tests from build (todd)
+
   OPTIMIZATIONS
 
     HDFS-1458. Improve checkpoint performance by avoiding unnecessary image

Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=1079069&r1=1079068&r2=1079069&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Tue Mar  8 01:32:40 2011
@@ -100,6 +100,7 @@
   <property name="test.hdfs.commit.tests.file" value="${test.src.dir}/commit-tests" />
   <property name="test.hdfs.smoke.tests.file" value="${test.src.dir}/smoke-tests" />
   <property name="test.hdfs.all.tests.file" value="${test.src.dir}/all-tests" />
+  <property name="test.exclude.file" value="/dev/null" />
 
   <property name="test.hdfs.rpc.engine" value=""/>
   <property name="test.libhdfs.dir" value="${test.build.dir}/libhdfs"/>
@@ -634,6 +635,7 @@
               aop/** system/**">
              <patternset>
                <includesfile name="@{test.file}"/>
+               <excludesfile name="${test.exclude.file}" />
              </patternset>
              <patternset refid="@{exclude.list.id}"/>
          </fileset>
@@ -641,7 +643,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>
         <batchtest todir="@{test.dir}" if="tests.testcase">
           <fileset dir="@{fileset.dir}/@{suite.type}" includes="**/${testcase}.java"