Browse Source

HADOOP-12714. Fix hadoop-mapreduce-client-nativetask unit test which fails because it is not able to open the "glibc bug spill" file. (cmccabe)

Colin Patrick Mccabe 9 years ago
parent
commit
5af5f9575a

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

@@ -691,6 +691,9 @@ Release 2.9.0 - UNRELEASED
 
 
    HADOOP-12712. Fix some cmake plugin and native build warnings (cmccabe)
    HADOOP-12712. Fix some cmake plugin and native build warnings (cmccabe)
 
 
+   HADOOP-12714. Fix hadoop-mapreduce-client-nativetask unit test which fails
+   because it is not able to open the "glibc bug spill" file. (cmccabe)
+
 Release 2.8.0 - UNRELEASED
 Release 2.8.0 - UNRELEASED
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 1 - 0
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/pom.xml

@@ -209,6 +209,7 @@
                 <goals><goal>cmake-test</goal></goals>
                 <goals><goal>cmake-test</goal></goals>
                 <configuration>
                 <configuration>
                   <testName>test-native-task</testName>
                   <testName>test-native-task</testName>
+                  <workingDirectory>${project.build.directory}/native/test</workingDirectory>
                   <source>${basedir}/src</source>
                   <source>${basedir}/src</source>
                   <binary>${project.build.directory}/native/test/nttest</binary>
                   <binary>${project.build.directory}/native/test/nttest</binary>
                   <args><arg>--gtest_filter=-Perf.</arg></args>
                   <args><arg>--gtest_filter=-Perf.</arg></args>

+ 9 - 0
hadoop-maven-plugins/src/main/java/org/apache/hadoop/maven/plugin/cmakebuilder/TestMojo.java

@@ -77,6 +77,12 @@ public class TestMojo extends AbstractMojo {
   @Parameter(defaultValue="600")
   @Parameter(defaultValue="600")
   private int timeout;
   private int timeout;
 
 
+  /**
+   * The working directory to use.
+   */
+  @Parameter
+  private File workingDirectory;
+
   /**
   /**
    * Path to results directory.
    * Path to results directory.
    */
    */
@@ -307,6 +313,9 @@ public class TestMojo extends AbstractMojo {
     getLog().info(bld.toString());
     getLog().info(bld.toString());
     ProcessBuilder pb = new ProcessBuilder(cmd);
     ProcessBuilder pb = new ProcessBuilder(cmd);
     Exec.addEnvironment(pb, env);
     Exec.addEnvironment(pb, env);
+    if (workingDirectory != null) {
+      pb.directory(workingDirectory);
+    }
     pb.redirectError(new File(results, testName + ".stderr"));
     pb.redirectError(new File(results, testName + ".stderr"));
     pb.redirectOutput(new File(results, testName + ".stdout"));
     pb.redirectOutput(new File(results, testName + ".stdout"));
     getLog().info("with extra environment variables " + Exec.envToString(env));
     getLog().info("with extra environment variables " + Exec.envToString(env));