HADOOP-4982. Merge -r 732881:732882 from trunk to branch 0.20.

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

CHANGES.txt

@@ -569,6 +569,8 @@ Release 0.19.1 - Unreleased
     HADOOP-4966. Marks completed setup tasks for removal. 
     (Amareshwari Sriramadasu via ddas)
 
+    HADOOP-4982. TestFsck should run in Eclipse. (shv)
+
 Release 0.19.0 - 2008-11-18
 
   INCOMPATIBLE CHANGES

src/test/org/apache/hadoop/hdfs/server/namenode/TestFsck.java

@@ -145,7 +145,8 @@ public class TestFsck extends TestCase {
       String block = dfsClient.namenode.
                       getBlockLocations(fileNames[0], 0, Long.MAX_VALUE).
                       get(0).getBlock().getBlockName();
-      File baseDir = new File(System.getProperty("test.build.data"),"dfs/data");
+      File baseDir = new File(System.getProperty("test.build.data",
+                                                 "build/test/data"),"dfs/data");
       for (int i=0; i<8; i++) {
         File blockFile = new File(baseDir, "data" +(i+1)+ "/current/" + block);
         if(blockFile.exists()) {
@@ -256,7 +257,8 @@ public class TestFsck extends TestCase {
     assertTrue(outStr.contains(NamenodeFsck.HEALTHY_STATUS));
     
     // corrupt replicas 
-    File baseDir = new File(System.getProperty("test.build.data"), "dfs/data");
+    File baseDir = new File(System.getProperty("test.build.data",
+                                               "build/test/data"),"dfs/data");
     for (int i=0; i < 6; i++) {
       File blockFile = new File(baseDir, "data" + (i+1) + "/current/" +
                                 block);