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

[ha...@apache.org]

Author: hashutosh
Date: Wed May  8 05:53:32 2013
New Revision: 1480164

URL: http://svn.apache.org/r1480164
Log:
HIVE-4466 : Fix continue.on.failure in unit tests to -well- continue on failure in unit tests (Gunther Hagleitner via Ashutosh Chauhan)

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

Modified: hive/trunk/build-common.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build-common.xml?rev=1480164&r1=1480163&r2=1480164&view=diff
==============================================================================
--- hive/trunk/build-common.xml (original)
+++ hive/trunk/build-common.xml Wed May  8 05:53:32 2013
@@ -70,6 +70,10 @@
   <property name="hadoop.opts.23" value="-D mapreduce.framework.name=local" />
   <property name="hadoop.opts.20" value="" />
 
+  <condition property="test.halt.on.failure" value="no" else="yes">
+    <equals arg1="${test.continue.on.failure}" arg2="true"/>
+  </condition>
+
   <target name="set-test-classpath">
     <typedef name="distinctelementsclasspath" classname="org.apache.hadoop.hive.ant.DistinctElementsClassPath"
       classpath="${build.dir.hive}/anttasks/hive-anttasks-${version}.jar:${build.ivy.lib.dir}/default/commons-collections-${commons-collections.version}.jar:${build.ivy.lib.dir}/default/commons-lang-${commons-lang.version}.jar"/>
@@ -429,7 +433,8 @@
         <echo message="Test Classpath: ${hadoop.testcp}"/>
       </then>
     </if>
-    <junit showoutput="${test.output}" printsummary="yes" haltonfailure="no"
+
+    <junit showoutput="${test.output}" printsummary="yes" haltonfailure="${test.halt.on.failure}"
            fork="yes" maxmemory="${test.junit.maxmemory}" dir="${basedir}" timeout="${test.junit.timeout}"
            errorProperty="tests.failed" failureProperty="tests.failed" filtertrace="off">
       <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/>

Modified: hive/trunk/build.properties
URL: http://svn.apache.org/viewvc/hive/trunk/build.properties?rev=1480164&r1=1480163&r2=1480164&view=diff
==============================================================================
--- hive/trunk/build.properties (original)
+++ hive/trunk/build.properties Wed May  8 05:53:32 2013
@@ -95,7 +95,7 @@ test.junit.timeout=43200000
 # ant test -Dtest.junit.exclude="**/Test*CliDriver.class,**/TestPartitions.class"
 test.junit.exclude=
 
-test.continue.on.failure=false
+test.continue.on.failure=true
 
 test.submodule.exclude=
 test.junit.maxmemory=512m
@@ -129,10 +129,6 @@ mvn.pom.dir=${build.dir.hive}/maven/poms
 mvn.license.dir=${build.dir.hive}/maven/licenses
 mvn.deploy.id=apache.snapshots.https
 mvn.deploy.url=https://repository.apache.org/content/repositories/snapshots
-#
-# unit test Properties
-#
-failonerror=false
 
 #
 # Data nucleus repository - needed for jdo2-api-2.3-ec.jar download

Modified: hive/trunk/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/build.xml?rev=1480164&r1=1480163&r2=1480164&view=diff
==============================================================================
--- hive/trunk/build.xml (original)
+++ hive/trunk/build.xml Wed May  8 05:53:32 2013
@@ -70,6 +70,10 @@
     <equals arg1="${mvn.publish.repo}" arg2="staging"/>
   </condition>
 
+  <condition property="test.halt.on.failure" value="no" else="yes">
+    <equals arg1="${test.continue.on.failure}" arg2="true"/>
+  </condition>
+
   <taskdef resource="net/sf/antcontrib/antcontrib.properties">
     <classpath>
       <pathelement location="${hive.root}/testlibs/ant-contrib-1.0b3.jar"/>
@@ -293,7 +297,7 @@
     <condition property="target.module" value="${module}" else="${iterate.hive.test}">
       <isset property="module"/>
     </condition>
-    <for list="${target.module}" param="module">
+    <for keepgoing="${test.continue.on.failure}" list="${target.module}" param="module">
       <sequential>
         <ant antfile="@{module}/build.xml" target="test" inheritAll="false" inheritRefs="true">
           <property name="build.dir.hive" location="${build.dir.hive}"/>
@@ -305,7 +309,7 @@
 
   <target name="test-shims">
     <echo message="Project: ${ant.project.name}"/>
-    <subant target="test" failonerror="${failonerror}">
+    <subant target="test" failonerror="${test.halt.on.failure}">
       <property name="hadoop.version" value="${hadoop.security.version}"/>
       <property name="hadoop.security.version" value="${hadoop.security.version}"/>
       <fileset dir="${hive.root}/shims" includes="build.xml"/>