HADOOP-6971. svn merge -c 1004107 from trunk

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.21@1004108 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1610,6 +1610,8 @@ Release 0.21.0 - 2010-08-13
     HADOOP-6875. [Herriot] Cleanup of temp. configurations is needed upon
     restart of a cluster (Vinay Thota via cos)
 
+    HADOOP-6971. Clover build doesn't generate per-test coverage (cos)
+
 Release 0.20.3 - Unreleased
 
   NEW FEATURES

build.xml

@@ -1421,7 +1421,8 @@
    <taskdef resource="cloverlib.xml" classpath="${clover.jar}"/>
    <mkdir dir="${clover.db.dir}"/>
    <clover-setup initString="${clover.db.dir}/hadoop_coverage.db">
-     <fileset dir="src" includes="java/**/*"/>
+     <fileset dir="${src.dir}" includes="java/**/*"/>
+     <testsources dir="${test.src.dir}"/>
    </clover-setup>
 </target>