diff --git a/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java b/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java index 7fffe13..abefa2d 100644 --- a/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java +++ b/ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java @@ -19,11 +19,7 @@ package org.apache.hadoop.hive.ant; -import java.io.BufferedWriter; -import java.io.File; -import java.io.FileFilter; -import java.io.FileWriter; -import java.io.IOException; +import java.io.*; import java.util.HashSet; import java.util.Set; import java.util.Arrays; @@ -509,6 +505,7 @@ public void execute() throws BuildException { System.out.println("queryDir = " + strQueryDir); ctx.put("queryDir", strQueryDir); ctx.put("qfiles", qFiles); + System.out.println("qFileNamesFile = " + qFileNamesFile); ctx.put("qFileNamesFile", qFileNamesFile); ctx.put("qfilesMap", qFilesMap); if (resultsDir != null) { @@ -536,6 +533,14 @@ public void execute() throws BuildException { t.merge(ctx, writer); writer.close(); + BufferedReader br = new BufferedReader(new FileReader(outFile.getCanonicalPath())); + String line; + System.out.println("+++++++++++++++++"); + while ((line = br.readLine()) != null) { + System.out.println(line); + } + System.out.println("-----------------"); + System.out.println("Generated " + outFile.getCanonicalPath() + " from template " + template); } catch(BuildException e) { throw e; diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java index 3fae0ba..b43e4a4 100644 --- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java +++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java @@ -2015,6 +2015,10 @@ public static void addTestsToSuiteFromQfileNames( Object setup, SuiteAddTestFunctor suiteAddTestCallback) { try { + Class cliDriverClass = Thread.currentThread().getContextClassLoader().loadClass("org.apache.hadoop.hive.cli.TestCliDriver"); + File cliDriverFile = new File(cliDriverClass.getProtectionDomain().getCodeSource().getLocation().getPath()); + System.out.println("TestCliDriver path is " + cliDriverFile.getCanonicalPath()); + System.out.println("QFileNamesFile is " + qFileNamesFile); File qFileNames = new File(qFileNamesFile); FileReader fr = new FileReader(qFileNames.getCanonicalFile()); BufferedReader br = new BufferedReader(fr); diff --git a/testutils/ptest2/src/main/resources/batch-exec.vm b/testutils/ptest2/src/main/resources/batch-exec.vm index da3e0ac..b0ffdd6 100644 --- a/testutils/ptest2/src/main/resources/batch-exec.vm +++ b/testutils/ptest2/src/main/resources/batch-exec.vm @@ -62,8 +62,10 @@ then testModule=./ fi pushd $testModule + echo "mvn -B test -Dmaven.repo.local=$localDir/$instanceName/maven $mavenArgs $mavenTestArgs $testArguments" 1>$logDir/maven-test.txt + find `pwd` -name TestCliDriver.java 1>>$logDir/maven-test.txt timeout 2h mvn -B test -Dmaven.repo.local=$localDir/$instanceName/maven \ - $mavenArgs $mavenTestArgs $testArguments 1>$logDir/maven-test.txt 2>&1 >$logDir/maven-test.txt 2>&1