svn commit: r1150533 - in /hadoop/common/trunk/mapreduce: CHANGES.txt src/test/mapred/org/apache/hadoop/mapred/MRCaching.java

[ma...@apache.org]

Author: mahadev
Date: Mon Jul 25 04:18:23 2011
New Revision: 1150533

URL: http://svn.apache.org/viewvc?rev=1150533&view=rev
Log:
MAPREDUCE-2575. TestMiniMRDFSCaching fails if test.build.dir is set to something other than build/test (Thomas Graves via mahadev)

Modified:
    hadoop/common/trunk/mapreduce/CHANGES.txt
    hadoop/common/trunk/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java

Modified: hadoop/common/trunk/mapreduce/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/CHANGES.txt?rev=1150533&r1=1150532&r2=1150533&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/CHANGES.txt (original)
+++ hadoop/common/trunk/mapreduce/CHANGES.txt Mon Jul 25 04:18:23 2011
@@ -347,6 +347,9 @@ Trunk (unreleased changes)
     MAPREDUCE-2409. DistributedCache maps files and archives to the same path,
     despite semantic incompatibility. (Siddharth Seth via cdouglas)
 
+    MAPREDUCE-2575. TestMiniMRDFSCaching fails if test.build.dir is set 
+    to something other than build/test (Thomas Graves via mahadev)
+
 Release 0.22.0 - Unreleased
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/trunk/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java?rev=1150533&r1=1150532&r2=1150533&view=diff
==============================================================================
--- hadoop/common/trunk/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java (original)
+++ hadoop/common/trunk/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java Mon Jul 25 04:18:23 2011
@@ -191,7 +191,7 @@ 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"));