diff --git ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java index 669bd81..33f227f 100644 --- ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java +++ ant/src/org/apache/hadoop/hive/ant/QTestGenTask.java @@ -442,7 +442,7 @@ public void execute() throws BuildException { } ctx.put("logDir", relativePath(hiveRootDir, logDir)); ctx.put("clusterMode", clusterMode); - ctx.put("hiveConfDir", hiveConfDir); + ctx.put("hiveConfDir", escapePath(hiveConfDir)); ctx.put("hadoopVersion", hadoopVersion); File outFile = new File(outDir, className + ".java"); diff --git pom.xml pom.xml index 426dca8..15ef9d4 100644 --- pom.xml +++ pom.xml @@ -60,7 +60,9 @@ . + ${maven.test.classpath} + file:// ${project.build.directory}/tmp ${project.build.directory}/warehouse pfile:// @@ -728,6 +730,7 @@ en_US.UTF-8 ${test.tmp.dir}/conf:${basedir}/${hive.path.to.root}/conf ${test.hive.hadoop.classpath} + ${env.PATH}${test.extra.path} ${project.build.directory} @@ -744,7 +747,7 @@ ${maven.repo.local} local - file://${test.tmp.dir}/conf/hive-log4j.properties + ${test.log4j.scheme}${test.tmp.dir}/conf/hive-log4j.properties true ${test.tmp.dir} @@ -1042,7 +1045,9 @@ ${basedir}/${hive.path.to.root}/testutils/hadoop.cmd + ;${env.HADOOP_HOME}/bin ${project.build.directory}/deplibs/* + file:/