Index: build-common.xml =================================================================== --- build-common.xml (revision 986451) +++ build-common.xml (working copy) @@ -50,7 +50,7 @@ - + @@ -330,16 +330,6 @@ - - - - - - - - - - Index: ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java =================================================================== --- ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (revision 986451) +++ ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (working copy) @@ -189,16 +189,18 @@ return null; } - public void initConf() { + public void initConf() throws Exception { if (miniMr) { - String fsName = conf.get("fs.default.name"); - assert fsName != null; - // hive.metastore.warehouse.dir needs to be set relative to the jobtracker - conf.set("hive.metastore.warehouse.dir", fsName - .concat("/build/ql/test/data/warehouse/")); - conf.set("mapred.job.tracker", "localhost:" + mr.getJobTrackerPort()); + assert dfs != null; + assert mr != null; + // set fs.default.name to the uri of mini-dfs + conf.setVar(HiveConf.ConfVars.HADOOPFS, dfs.getFileSystem().getUri().toString()); + // hive.metastore.warehouse.dir needs to be set relative to the mini-dfs + conf.setVar(HiveConf.ConfVars.METASTOREWAREHOUSE, + (new Path(dfs.getFileSystem().getUri().toString(), + "/build/ql/test/data/warehouse/")).toString()); + conf.setVar(HiveConf.ConfVars.HADOOPJT, "localhost:" + mr.getJobTrackerPort()); } - } public QTestUtil(String outDir, String logDir, boolean miniMr, String hadoopVer) throws Exception { @@ -501,7 +503,7 @@ } public void cliInit(String tname, boolean recreate) throws Exception { - if (miniMr || recreate) { + if (recreate) { cleanUp(); createSources(); } @@ -523,6 +525,7 @@ oldSs.out.close(); } SessionState.start(ss); + cliDriver = new CliDriver(); if (tname.equals("init_file.q")) { ss.initFiles.add("../data/scripts/test_init_file.sql"); @@ -843,6 +846,7 @@ "diff", "-a", "-I", "file:", "-I", "pfile:", + "-I", "hdfs:", "-I", "/tmp/", "-I", "invalidscheme:", "-I", "lastUpdateTime", Index: ql/build.xml =================================================================== --- ql/build.xml (revision 986451) +++ ql/build.xml (working copy) @@ -48,6 +48,7 @@ + @@ -93,6 +94,18 @@ /> + +