commit 85a120c58ad6c02039912435fc5d0e6c13392d6b Author: Vihang Karajgaonkar Date: Fri Dec 16 18:03:14 2016 -0800 HIVE-15460 : Fix ptest2 test failures diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt index 4882732bd99fb92cd88d3d19124894ca4f9ca00d..5acaee290613e1f767d4c1bdce51048d988ae15c 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testAlternativeTestJVM.approved.txt @@ -34,7 +34,7 @@ then export PATH=$JAVA_HOME/bin/:$PATH fi export ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m -Djava.io.tmpdir=/some/log/dir/tmp -Dhttp.proxyHost=somehost -Dhttp.proxyPort=3128" -export M2_OPTS="-Xmx1g -XX:MaxPermSize=256m -Djava.io.tmpdir=/some/log/dir/tmp ${mavenEnvOpts}" +export MAVEN_OPTS="-Xmx256m -Djava.io.tmpdir=/some/log/dir/tmp ${mavenEnvOpts}" export HADOOP_ROOT_LOGGER=INFO,console export HADOOP_OPTS="-Dhive.log.dir=/some/log/dir -Dhive.query.id=hadoop -Djava.io.tmpdir=/some/log/dir/tmp" cd /some/local/dir/instance-1/apache-source || exit 1 @@ -53,8 +53,6 @@ then fi echo "$$" > batch.pid find ./ -name 'TEST-*.xml' -delete -find ./ -name 'hive.log' -delete -find ./ -name junit_metastore_db | xargs -r rm -rf date +"%Y-%m-%d %T.%3N" echo "Pre test cleanup done" ret=0 diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt index 8c891f7ef5ac5687bba2a9f2e2764ca3c01e66e7..cb640298d28c00065aeebe1269fe594906088469 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testBatch.approved.txt @@ -34,7 +34,7 @@ then export PATH=$JAVA_HOME/bin/:$PATH fi export ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m -Djava.io.tmpdir=/some/log/dir/tmp -Dhttp.proxyHost=somehost -Dhttp.proxyPort=3128" -export M2_OPTS="-Xmx1g -XX:MaxPermSize=256m -Djava.io.tmpdir=/some/log/dir/tmp ${mavenEnvOpts}" +export MAVEN_OPTS="-Xmx256m -Djava.io.tmpdir=/some/log/dir/tmp ${mavenEnvOpts}" export HADOOP_ROOT_LOGGER=INFO,console export HADOOP_OPTS="-Dhive.log.dir=/some/log/dir -Dhive.query.id=hadoop -Djava.io.tmpdir=/some/log/dir/tmp" cd /some/local/dir/instance-1/apache-source || exit 1 @@ -53,8 +53,6 @@ then fi echo "$$" > batch.pid find ./ -name 'TEST-*.xml' -delete -find ./ -name 'hive.log' -delete -find ./ -name junit_metastore_db | xargs -r rm -rf date +"%Y-%m-%d %T.%3N" echo "Pre test cleanup done" ret=0 diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt index ecdd0638fa4be6a818e7b5a53df73bdf45c697bf..eff78f858a81b8cf23c41dd0cbdc5641f9adbdca 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepGit.approved.txt @@ -22,7 +22,7 @@ then export PATH=$JAVA_HOME/bin/:$PATH fi export ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m -Dhttp.proxyHost=somehost -Dhttp.proxyPort=3128" -export M2_OPTS="-Xmx1g -XX:MaxPermSize=256m ${mavenEnvOpts}" +export MAVEN_OPTS="-Xmx1g ${mavenEnvOpts}" cd /some/working/dir/ ( if [[ "true" == "true" ]] diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepHadoop1.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepHadoop1.approved.txt index 650a5b914fa199e20775d647e050c57caa0a5ec7..93f4b796c9dea8a3bc0af5b3436940f7273bd88a 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepHadoop1.approved.txt +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepHadoop1.approved.txt @@ -22,7 +22,7 @@ then export PATH=$JAVA_HOME/bin/:$PATH fi export ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m -Dhttp.proxyHost=somehost -Dhttp.proxyPort=3128" -export M2_OPTS="-Xmx1g -XX:MaxPermSize=256m ${mavenEnvOpts}" +export MAVEN_OPTS="-Xmx1g ${mavenEnvOpts}" cd /some/working/dir/ ( if [[ "true" == "true" ]] diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepNone.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepNone.approved.txt index 4678ebd8c579334ba27e96164756c3e83f765a64..19cfbc3932d32eecb69de5b307d35b71e9915996 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepNone.approved.txt +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepNone.approved.txt @@ -22,7 +22,7 @@ then export PATH=$JAVA_HOME/bin/:$PATH fi export ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m -Dhttp.proxyHost=somehost -Dhttp.proxyPort=3128" -export M2_OPTS="-Xmx1g -XX:MaxPermSize=256m ${mavenEnvOpts}" +export MAVEN_OPTS="-Xmx1g ${mavenEnvOpts}" cd /some/working/dir/ ( if [[ "false" == "true" ]] diff --git a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt index 4d428f4de3cdb97c7f09bcbeebb597001645bc84..cd45f5d86f9b69ab0e20656956e7154ecb1b8a67 100644 --- a/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt +++ b/testutils/ptest2/src/test/java/org/apache/hive/ptest/execution/TestScripts.testPrepSvn.approved.txt @@ -22,7 +22,7 @@ then export PATH=$JAVA_HOME/bin/:$PATH fi export ANT_OPTS="-Xmx1g -XX:MaxPermSize=256m -Dhttp.proxyHost=somehost -Dhttp.proxyPort=3128" -export M2_OPTS="-Xmx1g -XX:MaxPermSize=256m ${mavenEnvOpts}" +export MAVEN_OPTS="-Xmx1g ${mavenEnvOpts}" cd /some/working/dir/ ( if [[ "true" == "true" ]]