You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by li...@apache.org on 2016/01/28 08:20:42 UTC
[11/11] hive git commit: HIVE-12888: TestSparkNegativeCliDriver does
not run in Spark mode[Spark Branch] (Chengxiang via Xuefu)
HIVE-12888: TestSparkNegativeCliDriver does not run in Spark mode[Spark Branch] (Chengxiang via Xuefu)
Conflicts:
ql/src/test/templates/TestNegativeCliDriver.vm
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/277825fe
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/277825fe
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/277825fe
Branch: refs/heads/master
Commit: 277825fe8ea706ffbbb0d35d484097bc9e01a70f
Parents: b9f9959
Author: Xuefu Zhang <xz...@Cloudera.com>
Authored: Tue Jan 26 19:31:49 2016 -0800
Committer: Rui Li <ru...@intel.com>
Committed: Thu Jan 28 14:55:20 2016 +0800
----------------------------------------------------------------------
ql/src/test/templates/TestNegativeCliDriver.vm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/277825fe/ql/src/test/templates/TestNegativeCliDriver.vm
----------------------------------------------------------------------
diff --git a/ql/src/test/templates/TestNegativeCliDriver.vm b/ql/src/test/templates/TestNegativeCliDriver.vm
index d1cbbfd..592d64f 100644
--- a/ql/src/test/templates/TestNegativeCliDriver.vm
+++ b/ql/src/test/templates/TestNegativeCliDriver.vm
@@ -34,13 +34,17 @@ public class $className {
static {
MiniClusterType miniMR = MiniClusterType.valueForString("$clusterMode");
+ String hiveConfDir = "$hiveConfDir";
String initScript = "$initScript";
String cleanupScript = "$cleanupScript";
try {
String hadoopVer = "$hadoopVersion";
- qt = new QTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR, null, hadoopVer,
- initScript, cleanupScript, false, false);
+ if (!hiveConfDir.isEmpty()) {
+ hiveConfDir = HIVE_ROOT + hiveConfDir;
+ }
+ qt = new QTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR,
+ hiveConfDir, hadoopVer, initScript, cleanupScript, false, false);
// do a one time initialization
qt.cleanUp();
qt.createSources();