Propagate supbrocess' exit codes to the ninja exit code

src/build.cc

@@ -764,7 +764,9 @@ bool Builder::Build(string* err) {
       }
 
       --pending_commands;
-      if (!FinishCommand(&result, err)) {
+      bool command_finished = FinishCommand(&result, err);
+      SetExitCode(result.status);
+      if (!command_finished) {
         Cleanup();
         status_->BuildFinished();
         return false;
@@ -1036,3 +1038,8 @@ bool Builder::LoadDyndeps(Node* node, string* err) {
 
   return true;
 }
+
+void Builder::SetExitCode(int code) {
+  // Set code to the most recent error
+  if (code != 0) exit_code_ = code;
+}

src/build.h

@@ -155,7 +155,7 @@ struct CommandRunner {
   struct Result {
     Result() : edge(NULL) {}
     Edge* edge;
-    ExitStatus status;
+    int status;
     std::string output;
     bool success() const { return status == ExitSuccess; }
   };
@@ -233,6 +233,11 @@ struct Builder {
   std::unique_ptr<CommandRunner> command_runner_;
   Status* status_;
 
+  /// Keep the global exit code for the run
+  int exit_code_;
+  void SetExitCode(int code);
+  int ExitCode() { return exit_code_; }
+
  private:
   bool ExtractDeps(CommandRunner::Result* result, const std::string& deps_type,
                    const std::string& deps_prefix,

src/ninja.cc

@@ -1580,7 +1580,7 @@ int NinjaMain::RunBuild(int argc, char** argv, Status* status) {
     if (err.find("interrupted by user") != string::npos) {
       return 130;
     }
-    return 1;
+    return builder.ExitCode();
   }
 
   return 0;

src/subprocess-posix.cc

@@ -147,7 +147,7 @@ void Subprocess::OnPipeReady() {
   }
 }
 
-ExitStatus Subprocess::Finish() {
+int Subprocess::Finish() {
   assert(pid_ != -1);
   int status;
   if (waitpid(pid_, &status, 0) < 0)
@@ -164,16 +164,17 @@ ExitStatus Subprocess::Finish() {
   }
 #endif
 
+  int exit = 0;
   if (WIFEXITED(status)) {
-    int exit = WEXITSTATUS(status);
+    exit = WEXITSTATUS(status);
     if (exit == 0)
       return ExitSuccess;
   } else if (WIFSIGNALED(status)) {
     if (WTERMSIG(status) == SIGINT || WTERMSIG(status) == SIGTERM
         || WTERMSIG(status) == SIGHUP)
       return ExitInterrupted;
   }
-  return ExitFailure;
+  return exit;
 }
 
 bool Subprocess::Done() const {

src/subprocess-win32.cc

@@ -185,7 +185,7 @@ void Subprocess::OnPipeReady() {
   // function again later and get them at that point.
 }
 
-ExitStatus Subprocess::Finish() {
+int Subprocess::Finish() {
   if (!child_)
     return ExitFailure;
 
@@ -198,9 +198,8 @@ ExitStatus Subprocess::Finish() {
   CloseHandle(child_);
   child_ = NULL;
 
-  return exit_code == 0              ? ExitSuccess :
-         exit_code == CONTROL_C_EXIT ? ExitInterrupted :
-                                       ExitFailure;
+  return exit_code == CONTROL_C_EXIT ? ExitInterrupted :
+                                       (int)exit_code;
 }
 
 bool Subprocess::Done() const {

src/subprocess.h

@@ -44,7 +44,7 @@ struct Subprocess {
 
   /// Returns ExitSuccess on successful process exit, ExitInterrupted if
   /// the process was interrupted, ExitFailure if it otherwise failed.
-  ExitStatus Finish();
+  int Finish();
 
   bool Done() const;
 

src/subprocess_test.cc

@@ -14,6 +14,7 @@
 
 #include "subprocess.h"
 
+#include "exit_status.h"
 #include "test.h"
 
 #ifndef _WIN32
@@ -50,7 +51,10 @@ TEST_F(SubprocessTest, BadCommandStderr) {
     subprocs_.DoWork();
   }
 
-  EXPECT_EQ(ExitFailure, subproc->Finish());
+  int exit = subproc->Finish();
+  EXPECT_NE(ExitSuccess, exit);
+  EXPECT_NE(ExitFailure, exit);
+  EXPECT_NE(ExitInterrupted, exit);
   EXPECT_NE("", subproc->GetOutput());
 }
 
@@ -64,7 +68,10 @@ TEST_F(SubprocessTest, NoSuchCommand) {
     subprocs_.DoWork();
   }
 
-  EXPECT_EQ(ExitFailure, subproc->Finish());
+  int exit = subproc->Finish();
+  EXPECT_NE(ExitSuccess, exit);
+  EXPECT_NE(ExitFailure, exit);
+  EXPECT_NE(ExitInterrupted, exit);
   EXPECT_NE("", subproc->GetOutput());
 #ifdef _WIN32
   ASSERT_EQ("CreateProcess failed: The system cannot find the file "