diff --git build-common.xml build-common.xml index f2697e1..5422c39 100644 --- build-common.xml +++ build-common.xml @@ -55,7 +55,6 @@ - @@ -405,7 +404,7 @@ diff --git build.properties build.properties index ff9eba9..69c775f 100644 --- build.properties +++ build.properties @@ -73,6 +73,12 @@ common.jar=${hadoop.root}/lib/commons-httpclient-3.0.1.jar # 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" diff --git common/build.xml common/build.xml index 2712c03..24ad8f5 100755 --- common/build.xml +++ common/build.xml @@ -50,7 +50,7 @@ to call at top-level: ant deploy-contrib compile-core-test depends="test-conditions,gen-test,compile-test,test-jar,test-init">