svn commit: r883862 - in /hadoop/hdfs/trunk: CHANGES.txt build.xml src/c++/libhdfs/tests/test-libhdfs.sh

[co...@apache.org]

Author: cos
Date: Tue Nov 24 20:37:27 2009
New Revision: 883862

URL: http://svn.apache.org/viewvc?rev=883862&view=rev
Log:
HDFS-783. libhdfs tests brakes code coverage runs with Clover. Contributed by Konstantin Boudnik

Modified:
    hadoop/hdfs/trunk/CHANGES.txt
    hadoop/hdfs/trunk/build.xml
    hadoop/hdfs/trunk/src/c++/libhdfs/tests/test-libhdfs.sh

Modified: hadoop/hdfs/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/CHANGES.txt?rev=883862&r1=883861&r2=883862&view=diff
==============================================================================
--- hadoop/hdfs/trunk/CHANGES.txt (original)
+++ hadoop/hdfs/trunk/CHANGES.txt Tue Nov 24 20:37:27 2009
@@ -74,6 +74,8 @@
 
     HDFS-756. libhdfs unit tests do not run. (Eli Collins via cos)
 
+    HDFS-783. libhdfs tests brakes code coverage runs with Clover (cos)
+
 Release 0.21.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/hdfs/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/build.xml?rev=883862&r1=883861&r2=883862&view=diff
==============================================================================
--- hadoop/hdfs/trunk/build.xml (original)
+++ hadoop/hdfs/trunk/build.xml Tue Nov 24 20:37:27 2009
@@ -1036,6 +1036,7 @@
         <env key="LIBHDFS_SRC_DIR" value="${c++.libhdfs.src}"/>
         <env key="LIBHDFS_INSTALL_DIR" value="${install.c++}/lib"/>  
         <env key="LIB_DIR" value="${common.ivy.lib.dir}"/>
+        <env key="CLOVER_JAR" value="${clover.jar}"/>
 		<arg value="test"/>
     </exec>
   </target>

Modified: hadoop/hdfs/trunk/src/c++/libhdfs/tests/test-libhdfs.sh
URL: http://svn.apache.org/viewvc/hadoop/hdfs/trunk/src/c%2B%2B/libhdfs/tests/test-libhdfs.sh?rev=883862&r1=883861&r2=883862&view=diff
==============================================================================
--- hadoop/hdfs/trunk/src/c++/libhdfs/tests/test-libhdfs.sh (original)
+++ hadoop/hdfs/trunk/src/c++/libhdfs/tests/test-libhdfs.sh Tue Nov 24 20:37:27 2009
@@ -17,7 +17,7 @@
 #
 
 #
-# Note: This script depends on 5 environment variables to function correctly:
+# Note: This script depends on 8 environment variables to function correctly:
 # a) CLASSPATH
 # b) HADOOP_HOME
 # c) HADOOP_CONF_DIR 
@@ -25,6 +25,7 @@
 # e) LIBHDFS_BUILD_DIR
 # f) LIBHDFS_INSTALL_DIR
 # g) OS_NAME
+# h) CLOVER_JAR
 # All these are passed by build.xml.
 #
 
@@ -72,6 +73,9 @@
   CLASSPATH=${CLASSPATH}:$HADOOP_HOME/build/test/classes
 fi
 
+# add Clover jar file needed for code coverage runs
+CLASSPATH=${CLASSPATH}:${CLOVER_JAR};
+
 # so that filenames w/ spaces are handled correctly in loops below
 IFS=