hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From c..@apache.org
Subject svn commit: r1378470 - in /hive/trunk: build-common.xml build.properties common/build.xml
Date Wed, 29 Aug 2012 08:02:57 GMT
Author: cws
Date: Wed Aug 29 08:02:57 2012
New Revision: 1378470

URL: http://svn.apache.org/viewvc?rev=1378470&view=rev
Log:
HIVE-3409. Increase test.junit.timeout value (Carl Steinbach 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=1378470&r1=1378469&r2=1378470&view=diff
==============================================================================
--- hive/trunk/build-common.xml (original)
+++ hive/trunk/build-common.xml Wed Aug 29 08:02:57 2012
@@ -55,7 +55,6 @@
   <property name="test.include" value="Test*"/>
   <property name="test.classpath.id" value="test.classpath"/>
   <property name="test.output" value="true"/>
-  <property name="test.timeout" value="18200000"/>
   <property name="test.junit.output.format" value="xml"/>
   <property name="test.junit.output.usefile" value="true"/>
   <property name="minimr.query.files" value="input16_cc.q,scriptfile1.q,bucket4.q,bucketmapjoin6.q,disable_merge_for_bucketing.q,reduce_deduplicate.q,smb_mapjoin_8.q,join1.q,groupby2.q,bucketizedhiveinputformat.q"/>
@@ -405,7 +404,7 @@
       </then>
     </if>
     <junit showoutput="${test.output}" printsummary="yes" haltonfailure="no"
-           fork="yes" maxmemory="512m" dir="${basedir}" timeout="${test.timeout}"
+           fork="yes" maxmemory="512m" dir="${basedir}" timeout="${test.junit.timeout}"
            errorProperty="tests.failed" failureProperty="tests.failed" filtertrace="off">
       <env key="LANG" value="${test.lang}"/>
       <env key="HIVE_HADOOP_TEST_CLASSPATH" value="${hadoop.testcp}"/>

Modified: hive/trunk/build.properties
URL: http://svn.apache.org/viewvc/hive/trunk/build.properties?rev=1378470&r1=1378469&r2=1378470&view=diff
==============================================================================
--- hive/trunk/build.properties (original)
+++ hive/trunk/build.properties Wed Aug 29 08:02:57 2012
@@ -73,6 +73,12 @@ common.jar=${hadoop.root}/lib/commons-ht
 # Test Properties
 #
 
+# Cancel the individual tests if they don't finish in the given time
+# (measured in milliseconds). Ignored if fork is disabled. When running
+# multiple tests inside the same Java VM (see forkMode), timeout
+# applies to the time that all tests use together, not to an individual test.
+test.junit.timeout=36400000
+
 # 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"

Modified: hive/trunk/common/build.xml
URL: http://svn.apache.org/viewvc/hive/trunk/common/build.xml?rev=1378470&r1=1378469&r2=1378470&view=diff
==============================================================================
--- hive/trunk/common/build.xml (original)
+++ hive/trunk/common/build.xml Wed Aug 29 08:02:57 2012
@@ -50,7 +50,7 @@ to call at top-level: ant deploy-contrib
   	depends="test-conditions,gen-test,compile-test,test-jar,test-init">
     <echo message="Project: ${ant.project.name}"/>
     <junit showoutput="${test.output}" printsummary="yes" haltonfailure="no"
-           fork="yes" maxmemory="512m" dir="${basedir}" timeout="${test.timeout}"
+           fork="yes" maxmemory="512m" dir="${basedir}" timeout="${test.junit.timeout}"
            errorProperty="tests.failed" failureProperty="tests.failed" filtertrace="off">
       <sysproperty key="test.build.resources" value="${test.build.resources}"/>   
        
       <classpath refid="${test.classpath.id}"/>



Mime
View raw message