Browse Source

Merge -c 1186552 from trunk to branch-0.23 to complete fix for MAPREDUCE-3179.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1186553 13f79535-47bb-0310-9956-ffa450edef68
Arun Murthy 13 years ago
parent
commit
2115478185

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -1649,6 +1649,9 @@ Release 0.23.0 - Unreleased
     MAPREDUCE-3212. Fix usage/help message for bin/yarn. (Bhallamudi Venkata 
     MAPREDUCE-3212. Fix usage/help message for bin/yarn. (Bhallamudi Venkata 
     Siva Kamesh via acmurthy) 
     Siva Kamesh via acmurthy) 
 
 
+    MAPREDUCE-3179. Ensure failed tests exit with right error code. (Jonathan
+    Eagles via acmurthy)
+
 Release 0.22.0 - Unreleased
 Release 0.22.0 - Unreleased
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 3 - 1
hadoop-mapreduce-project/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java

@@ -107,11 +107,13 @@ public class MapredTestDriver {
   }
   }
 
 
   public void run(String argv[]) {
   public void run(String argv[]) {
+    int exitCode = -1;
     try {
     try {
-      pgd.driver(argv);
+      exitCode = pgd.driver(argv);
     } catch(Throwable e) {
     } catch(Throwable e) {
       e.printStackTrace();
       e.printStackTrace();
     }
     }
+    System.exit(exitCode);
   }
   }
 
 
   public static void main(String argv[]){
   public static void main(String argv[]){