diff --git itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java index 25dbde9..d6e33f8 100644 --- itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java +++ itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java @@ -287,9 +287,6 @@ private void convertPathsFromWindowsToHdfs() { String orgTestTempDir = System.getProperty("test.tmp.dir"); System.setProperty("test.tmp.dir", getHdfsUriString(orgTestTempDir)); - String orgTestDataDir = System.getProperty("test.src.data.dir"); - System.setProperty("test.src.data.dir", getHdfsUriString(orgTestDataDir)); - String orgScratchDir = conf.getVar(HiveConf.ConfVars.SCRATCHDIR); conf.setVar(HiveConf.ConfVars.SCRATCHDIR, getHdfsUriString(orgScratchDir)); diff --git pom.xml pom.xml index 5a2e429..d3cbdd8 100644 --- pom.xml +++ pom.xml @@ -60,6 +60,7 @@ . + ${maven.test.classpath} ${project.build.directory}/tmp ${project.build.directory}/warehouse pfile:// @@ -726,7 +727,7 @@ US/Pacific en_US.UTF-8 ${test.tmp.dir}/conf:${basedir}/${hive.path.to.root}/conf - ${maven.test.classpath} + ${test.hive.hadoop.classpath} ${project.build.directory} @@ -756,6 +757,7 @@ ${test.dfs.mkdir} ${test.output.overwrite} ${test.warehouse.scheme}${test.warehouse.dir} + true src,src1,srcbucket,srcbucket2,src_json,src_thrift,src_sequencefile,srcpart,alltypesorc ${test.tmp.dir}/conf/krb5.conf @@ -1002,5 +1004,46 @@ + + + windows-test + + + Windows + + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 2.8 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/deplibs/ + false + false + true + + + + + + + + ${basedir}/${hive.path.to.root}/testutils/hadoop.cmd + ${project.build.directory}/deplibs/* + + diff --git ql/src/test/org/apache/hadoop/hive/ql/WindowsPathUtil.java ql/src/test/org/apache/hadoop/hive/ql/WindowsPathUtil.java index ce9c207..131260b 100644 --- ql/src/test/org/apache/hadoop/hive/ql/WindowsPathUtil.java +++ ql/src/test/org/apache/hadoop/hive/ql/WindowsPathUtil.java @@ -30,9 +30,6 @@ public static void convertPathsFromWindowsToHdfs(HiveConf conf){ String orgTestTempDir = System.getProperty("test.tmp.dir"); System.setProperty("test.tmp.dir", getHdfsUriString(orgTestTempDir)); - String orgTestDataDir = System.getProperty("test.src.data.dir"); - System.setProperty("test.src.data.dir", getHdfsUriString(orgTestDataDir)); - String orgScratchDir = conf.getVar(HiveConf.ConfVars.SCRATCHDIR); conf.setVar(HiveConf.ConfVars.SCRATCHDIR, getHdfsUriString(orgScratchDir)); }