You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by he...@apache.org on 2011/10/21 19:28:19 UTC
svn commit: r1187474 -
/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
Author: heyongqiang
Date: Fri Oct 21 17:28:19 2011
New Revision: 1187474
URL: http://svn.apache.org/viewvc?rev=1187474&view=rev
Log:
HIVE-2516:cleaunup QTestUtil: use test.data.files as current directory if one not specified (namit via He Yongqiang)
Modified:
hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
Modified: hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java?rev=1187474&r1=1187473&r2=1187474&view=diff
==============================================================================
--- hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java (original)
+++ hive/trunk/ql/src/test/org/apache/hadoop/hive/ql/QTestUtil.java Fri Oct 21 17:28:19 2011
@@ -88,10 +88,6 @@ public class QTestUtil {
private static final Log LOG = LogFactory.getLog("QTestUtil");
private String testWarehouse;
- private final String tmpdir= System.getProperty("test.tmp.dir") ;
- private final Path tmppath = new Path(tmpdir);
-
-
private final String testFiles;
protected final String outDir;
protected final String logDir;
@@ -234,7 +230,13 @@ public class QTestUtil {
initConf();
- testFiles = conf.get("test.data.files").replace('\\', '/')
+ // Use the current directory if it is not specified
+ String dataDir = conf.get("test.data.files");
+ if (dataDir == null) {
+ dataDir = new File(".").getAbsolutePath() + "/data/files";
+ }
+
+ testFiles = dataDir.replace('\\', '/')
.replace("c:", "");
String ow = System.getProperty("test.output.overwrite");