commit d8d61c0243eed969e3ef78ff92f659da94b92d47 Author: Brock Noland Date: Wed Feb 25 12:40:43 2015 -0800 Attempt to fix hiveConfDir diff --git a/itests/qtest-spark/pom.xml b/itests/qtest-spark/pom.xml index 2247145..db48571 100644 --- a/itests/qtest-spark/pom.xml +++ b/itests/qtest-spark/pom.xml @@ -342,7 +342,7 @@ clusterMode="spark" includeQueryFile="${spark.query.files}" runDisabled="${run_disabled}" - hiveConfDir="${basedir}/${hive.path.to.root}/data/conf/spark/standalone" + hiveConfDir="data/conf/spark/standalone" resultsDirectory="${basedir}/${hive.path.to.root}/ql/src/test/results/clientpositive/spark" className="TestSparkCliDriver" logFile="${project.build.directory}/testsparkclidrivergen.log" @@ -358,7 +358,7 @@ clusterMode="miniSparkOnYarn" includeQueryFile="${miniSparkOnYarn.query.files}" runDisabled="${run_disabled}" - hiveConfDir="${basedir}/${hive.path.to.root}/data/conf/spark/yarn-client" + hiveConfDir="data/conf/spark/yarn-client" resultsDirectory="${basedir}/${hive.path.to.root}/ql/src/test/results/clientpositive/spark" className="TestMiniSparkOnYarnCliDriver" logFile="${project.build.directory}/testminisparkonyarnclidrivergen.log" diff --git a/itests/qtest/pom.xml b/itests/qtest/pom.xml index e9653f6..4a64bde 100644 --- a/itests/qtest/pom.xml +++ b/itests/qtest/pom.xml @@ -540,7 +540,7 @@ queryFileRegex="${qfile_regex}" clusterMode="tez" runDisabled="${run_disabled}" - hiveConfDir="${basedir}/${hive.path.to.root}/data/conf/tez" + hiveConfDir="data/conf/tez" resultsDirectory="${basedir}/${hive.path.to.root}/ql/src/test/results/clientpositive/tez" className="TestMiniTezCliDriver" logFile="${project.build.directory}/testminitezclidrivergen.log" @@ -558,7 +558,7 @@ queryFileRegex="${qfile_regex}" clusterMode="encrypted" runDisabled="${run_disabled}" - hiveConfDir="${basedir}/${hive.path.to.root}/data/conf" + hiveConfDir="data/conf" resultsDirectory="${basedir}/${hive.path.to.root}/ql/src/test/results/clientpositive/encrypted" className="TestEncryptedHDFSCliDriver" logFile="${project.build.directory}/testencryptedhdfsclidrivergen.log" diff --git a/ql/src/test/templates/TestCliDriver.vm b/ql/src/test/templates/TestCliDriver.vm index 87eaf3d..7566fcb 100644 --- a/ql/src/test/templates/TestCliDriver.vm +++ b/ql/src/test/templates/TestCliDriver.vm @@ -37,6 +37,9 @@ public class $className extends TestCase { MiniClusterType miniMR = MiniClusterType.valueForString("$clusterMode"); String hiveConfDir = "$hiveConfDir"; + if (!hiveConfDir.isEmpty()) { + hiveConfDir = HIVE_ROOT + hiveConfDir; + } String initScript = "$initScript"; String cleanupScript = "$cleanupScript"; try { diff --git a/ql/src/test/templates/TestCompareCliDriver.vm b/ql/src/test/templates/TestCompareCliDriver.vm index fdc9565..75f2976 100644 --- a/ql/src/test/templates/TestCompareCliDriver.vm +++ b/ql/src/test/templates/TestCompareCliDriver.vm @@ -38,6 +38,9 @@ public class $className extends TestCase { MiniClusterType miniMR = MiniClusterType.valueForString("$clusterMode"); String hiveConfDir = "$hiveConfDir"; + if (!hiveConfDir.isEmpty()) { + hiveConfDir = HIVE_ROOT + hiveConfDir; + } String initScript = "$initScript"; String cleanupScript = "$cleanupScript"; try {