Repository: hive Updated Branches: refs/heads/spark 8e0a10c82 -> e07826041
HIVE-12888: TestSparkNegativeCliDriver does not run in Spark mode[Spark Branch] (Chengxiang via Xuefu) Project: http://git-wip-us.apache.org/repos/asf/hive/repo Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/e0782604 Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/e0782604 Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/e0782604 Branch: refs/heads/spark Commit: e07826041e0326228ab4eeeaebe46625bbac3c99 Parents: 8e0a10c Author: Xuefu Zhang <[email protected]> Authored: Tue Jan 26 19:31:49 2016 -0800 Committer: Xuefu Zhang <[email protected]> Committed: Tue Jan 26 19:31:49 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/e0782604/ql/src/test/templates/TestNegativeCliDriver.vm ---------------------------------------------------------------------- diff --git a/ql/src/test/templates/TestNegativeCliDriver.vm b/ql/src/test/templates/TestNegativeCliDriver.vm index 5f8ee8e..2ea476f 100644 --- a/ql/src/test/templates/TestNegativeCliDriver.vm +++ b/ql/src/test/templates/TestNegativeCliDriver.vm @@ -41,13 +41,17 @@ public class $className extends TestCase { 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, hadoopVer, - initScript, cleanupScript); + if (!hiveConfDir.isEmpty()) { + hiveConfDir = HIVE_ROOT + hiveConfDir; + } + qt = new QTestUtil((HIVE_ROOT + "$resultsDir"), (HIVE_ROOT + "$logDir"), miniMR, + hiveConfDir, hadoopVer, initScript, cleanupScript); // do a one time initialization qt.cleanUp(); qt.createSources();
