diff --git a/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java b/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java index 52ef276..739bb6d 100644 --- a/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java +++ b/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java @@ -252,6 +252,11 @@ private void convertPathsFromWindowsToHdfs() { String orgScratchDir = conf.getVar(HiveConf.ConfVars.SCRATCHDIR); conf.setVar(HiveConf.ConfVars.SCRATCHDIR, getHdfsUriString(orgScratchDir)); + + if (miniMr) { + String orgAuxJarFolder = conf.getAuxJars(); + conf.setAuxJars(getHdfsUriString("file://" + orgAuxJarFolder)); + } } private String getHdfsUriString(String uriStr) { @@ -1048,6 +1053,10 @@ private void maskPatterns(String[] patterns, String fname) throws Exception { in = new BufferedReader(new FileReader(fname)); out = new BufferedWriter(new FileWriter(fname + ".orig")); while (null != (line = in.readLine())) { + // Ignore the empty lines on windows + if(line.isEmpty() && Shell.WINDOWS) { + continue; + } out.write(line); out.write('\n'); }