Index: build-common.xml
===================================================================
--- build-common.xml (revision 899000)
+++ build-common.xml (working copy)
@@ -305,6 +305,10 @@
+
+
+
+
Index: build.xml
===================================================================
--- build.xml (revision 899000)
+++ build.xml (working copy)
@@ -68,6 +68,7 @@
+
@@ -78,6 +79,7 @@
+
@@ -87,6 +89,7 @@
+
@@ -181,6 +184,7 @@
depends="jar"
description="Generate test data">
+
Index: data/conf/hive-log4j.properties
===================================================================
--- data/conf/hive-log4j.properties (revision 899000)
+++ data/conf/hive-log4j.properties (working copy)
@@ -1,6 +1,6 @@
# Define some default values that can be overridden by system properties
hive.root.logger=DEBUG,DRFA
-hive.log.dir=${user.dir}/../build/ql/tmp/
+hive.log.dir=${build.dir.hive}/ql/tmp/
hive.log.file=hive.log
# Define the root logger to the system property "hadoop.root.logger".
Index: data/conf/hive-site.xml
===================================================================
--- data/conf/hive-site.xml (revision 899000)
+++ data/conf/hive-site.xml (working copy)
@@ -12,18 +12,19 @@
hadoop.tmp.dir
- ${user.dir}/../build/test/hadoop-${user.name}
+ ${build.dir.hive}/test/hadoop-${user.name}
A base for other temporary directories.
hive.exec.scratchdir
- ${user.dir}/../build/ql/tmp
+ ${build.dir}/scratchdir
Scratch space for Hive jobs
javax.jdo.option.ConnectionURL
+
jdbc:derby:;databaseName=../build/test/junit_metastore_db;create=true
@@ -51,13 +52,13 @@
hive.metastore.warehouse.dir
- file://${user.dir}/../build/ql/test/data/warehouse/
+ file://${build.dir}/test/data/warehouse/
hive.metastore.metadb.dir
- file://${user.dir}/../build/ql/test/data/metadb/
+ file://${build.dir}/test/data/metadb/
Required by metastore server or if the uris argument below is not supplied
@@ -77,13 +78,13 @@
test.log.dir
- ${user.dir}/../build/ql/test/logs
+ ${build.dir}/test/logs
test.src.dir
- file://${user.dir}/../ql/src/test
+ file://${build.dir}/src/test
@@ -102,7 +103,7 @@
hive.jar.path
- ${user.dir}/../build/ql/hive_exec.jar
+ ${build.dir.hive}/ql/hive_exec.jar
@@ -114,7 +115,7 @@
hive.querylog.location
- ${user.dir}/../build/ql/tmp
+ ${build.dir}/tmp
Location of the structured hive logs
Index: ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
===================================================================
--- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (revision 899000)
+++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (working copy)
@@ -42,6 +42,7 @@
import org.apache.hadoop.hive.cli.CliDriver;
import org.apache.hadoop.hive.cli.CliSessionState;
import org.apache.hadoop.hive.conf.HiveConf;
+import org.apache.hadoop.hive.conf.HiveConf.ConfVars;
import org.apache.hadoop.hive.metastore.MetaStoreUtils;
import org.apache.hadoop.hive.ql.exec.FunctionRegistry;
import org.apache.hadoop.hive.ql.exec.Task;
@@ -71,8 +72,9 @@
public class QTestUtil {
private String testWarehouse;
- private String tmpdir = System.getProperty("user.dir")+"/../build/ql/tmp";
+ private String tmpdir = System.getProperty("test.tmp.dir");
private Path tmppath = new Path(tmpdir);
+
private String testFiles;
private String outDir;
private String logDir;