Просмотр исходного кода

HDFS-783. libhdfs tests brakes code coverage runs with Clover. Contributed by Konstantin Boudnik

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hdfs/trunk@883862 13f79535-47bb-0310-9956-ffa450edef68
Konstantin Boudnik 15 лет назад
Родитель
Сommit
85c1cc4040
3 измененных файлов с 8 добавлено и 1 удалено
  1. 2 0
      CHANGES.txt
  2. 1 0
      build.xml
  3. 5 1
      src/c++/libhdfs/tests/test-libhdfs.sh

+ 2 - 0
CHANGES.txt

@@ -74,6 +74,8 @@ Trunk (unreleased changes)
 
     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

+ 1 - 0
build.xml

@@ -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>

+ 5 - 1
src/c++/libhdfs/tests/test-libhdfs.sh

@@ -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 @@ if [ -d "$HADOOP_HOME/build/test/classes" ]; then
   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=