HADOOP-7364. TestMiniMRDFSCaching fails if test.build.dir is set to

something other than build/test. (Thomas Graves via mahadev)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security-204@1136693 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -1,9 +1,5 @@
 Hadoop Change Log
 
-Release 0.20.205.0 - unreleased
-
-  BUG FIXES
-
 Release 0.20.204.0 - unreleased
 
   NEW FEATURES
@@ -15,6 +11,9 @@ Release 0.20.204.0 - unreleased
 
   BUG FIXES
 
+    HADOOP-7364. TestMiniMRDFSCaching fails if test.build.dir is set to 
+    something other than build/test. (Thomas Graves via mahadev)
+
     HADOOP-7373. Fix {start,stop}-{dfs,mapred} and hadoop-daemons.sh from
     trying to use the wrong bin directory. (omalley)
 

src/test/org/apache/hadoop/mapred/MRCaching.java

@@ -189,7 +189,8 @@ public class MRCaching {
 
   static void setupCache(String cacheDir, FileSystem fs) 
   throws IOException {
-    Path localPath = new Path("build/test/cache");
+    Path localPath = new Path(System.getProperty("test.cache.data", "build/test/cache"));
+
     Path txtPath = new Path(localPath, new Path("test.txt"));
     Path jarPath = new Path(localPath, new Path("test.jar"));
     Path zipPath = new Path(localPath, new Path("test.zip"));