svn commit: r1377359 - in /hive/trunk: build-common.xml build.properties common/build.xml

[cw...@apache.org]

Author: cws
Date: Sat Aug 25 21:56:27 2012
New Revision: 1377359

URL: http://svn.apache.org/viewvc?rev=1377359&view=rev
Log:
HIVE-3345. Add junit exclude utility to disable testcases (Zhenxiao Luo via cws)

Modified:
    hive/trunk/build-common.xml
    hive/trunk/build.properties
    hive/trunk/common/build.xml

Modified: hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build-common.xml?rev=1377359&r1=1377358&r2=1377359&view=diff
==============================================================================
--- hive/trunk/build-common.xml (original)
+++ hive/trunk/build-common.xml Sat Aug 25 21:56:27 2012
@@ -440,7 +440,7 @@
       <batchtest todir="${test.build.dir}" unless="testcase">
         <fileset dir="${test.build.classes}"
                  includes="**/${test.include}.class"
-                 excludes="**/TestSerDe.class,**/TestHiveMetaStore.class,**/*$*.class" />
+                 excludes="**/TestSerDe.class,**/TestHiveMetaStore.class,**/*$*.class,${test.junit.exclude}" />
       </batchtest>
       <batchtest todir="${test.build.dir}" if="testcase">
         <fileset dir="${test.build.classes}" includes="**/${testcase}.class"/>

Modified: hive/trunk/build.properties
URL: http://svn.apache.org/viewvc/hive/trunk/build.properties?rev=1377359&r1=1377358&r2=1377359&view=diff
==============================================================================
--- hive/trunk/build.properties (original)
+++ hive/trunk/build.properties Sat Aug 25 21:56:27 2012
@@ -70,6 +70,15 @@ jsp.test.jar=${hadoop.root}/lib/jetty-ex
 common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar
 
 #
+# Test Properties
+#
+
+# Use this property to selectively disable tests from the command line:
+# ant test -Dtest.junit.exclude="**/TestCliDriver.class"
+# ant test -Dtest.junit.exclude="**/Test*CliDriver.class,**/TestPartitions.class"
+test.junit.exclude=
+
+#
 # Ivy Properties
 #
 build.ivy.dir=${build.dir.hive}/ivy

Modified: hive/trunk/common/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/common/build.xml?rev=1377359&r1=1377358&r2=1377359&view=diff
==============================================================================
--- hive/trunk/common/build.xml (original)
+++ hive/trunk/common/build.xml Sat Aug 25 21:56:27 2012
@@ -58,7 +58,7 @@ to call at top-level: ant deploy-contrib
       <batchtest todir="${test.build.dir}" unless="testcase">
         <fileset dir="${test.build.classes}"
                  includes="**/${test.include}.class"
-                 excludes="**/*$*.class" />
+                 excludes="**/*$*.class,${test.junit.exclude}" />
       </batchtest>
       <batchtest todir="${test.build.dir}" if="testcase">
         <fileset dir="${test.build.classes}" includes="**/${testcase}.class"/>