From 00b526a146f1f5618420f70dcc964a892259d426 Mon Sep 17 00:00:00 2001 From: Mahadev Konar Date: Mon, 25 Jul 2011 04:18:23 +0000 Subject: [PATCH] MAPREDUCE-2575. 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/trunk@1150533 13f79535-47bb-0310-9956-ffa450edef68 --- mapreduce/CHANGES.txt | 3 +++ .../src/test/mapred/org/apache/hadoop/mapred/MRCaching.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mapreduce/CHANGES.txt b/mapreduce/CHANGES.txt index fb38f21e021..9e1b1f4483f 100644 --- a/mapreduce/CHANGES.txt +++ b/mapreduce/CHANGES.txt @@ -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 diff --git a/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java b/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java index fcd29b0f555..02b6e58d0d2 100644 --- a/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java +++ b/mapreduce/src/test/mapred/org/apache/hadoop/mapred/MRCaching.java @@ -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"));