Merge pull request #199 from qhuo/create-process

Mark CreateProcess "program not found" failure as non-fatal

2 files changed, 38 insertions, 2 deletions

diff --git a/src/subprocess-win32.cc b/src/subprocess-win32.cc
index cf61feb..e757f7e 100644
--- a/src/subprocess-win32.cc
+++ b/src/subprocess-win32.cc
@@ -95,7 +95,18 @@ bool Subprocess::Start(SubprocessSet* set, const string& command) {
                       /* inherit handles */ TRUE, 0,
                       NULL, NULL,
                       &startup_info, &process_info)) {
-    Win32Fatal("CreateProcess");
+    DWORD error = GetLastError();
+    if (error == ERROR_FILE_NOT_FOUND) { // file (program) not found error is treated as a normal build action failure
+      if (child_pipe)
+        CloseHandle(child_pipe);
+      CloseHandle(pipe_);
+      pipe_ = NULL;
+      // child_ is already NULL;
+      buf_ = "CreateProcess failed: The system cannot find the file specified.\n";
+      return true;
+    } else {
+      Win32Fatal("CreateProcess");    // pass all other errors to Win32Fatal
+    }
   }
 
   // Close pipe channel only used by the child.
@@ -139,6 +150,10 @@ void Subprocess::OnPipeReady() {
 }
 
 bool Subprocess::Finish() {
+  if (! child_) {
+    return false;
+  }
+
   // TODO: add error handling for all of these.
   WaitForSingleObject(child_, INFINITE);
 
@@ -170,7 +185,10 @@ SubprocessSet::~SubprocessSet() {
 }
 
 void SubprocessSet::Add(Subprocess* subprocess) {
-  running_.push_back(subprocess);
+  if (subprocess->child_)
+    running_.push_back(subprocess);
+  else
+    finished_.push(subprocess);
 }
 
 void SubprocessSet::DoWork() {
diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc
index 47b7b56..840287b 100644
--- a/src/subprocess_test.cc
+++ b/src/subprocess_test.cc
@@ -45,6 +45,24 @@ TEST_F(SubprocessTest, BadCommandStderr) {
   EXPECT_NE("", subproc->GetOutput());
 }
 
+// Run a command that does not exist
+TEST_F(SubprocessTest, NoSuchCommand) {
+  Subprocess* subproc = new Subprocess;
+  EXPECT_TRUE(subproc->Start(&subprocs_, "ninja_no_such_command"));
+  subprocs_.Add(subproc);
+
+  while (!subproc->Done()) {
+    // Pretend we discovered that stderr was ready for writing.
+    subprocs_.DoWork();
+  }
+
+  EXPECT_FALSE(subproc->Finish());
+  EXPECT_NE("", subproc->GetOutput());
+#ifdef _WIN32
+  ASSERT_EQ("CreateProcess failed: The system cannot find the file specified.\n", subproc->GetOutput());
+#endif
+}
+
 TEST_F(SubprocessTest, SetWithSingle) {
   Subprocess* subproc = new Subprocess;
   EXPECT_TRUE(subproc->Start(&subprocs_, kSimpleCommand));