Implement cleanup-on-interrupt

This causes us to clean up by deleting any output files belonging
to currently-running commands before we quit if we are interrupted
(either by Ctrl-C or by a command failing).

Fixes issue #110.

1 files changed, 40 insertions, 16 deletions

diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc
index 840287b..5b3e8a3 100644
--- a/src/subprocess_test.cc
+++ b/src/subprocess_test.cc
@@ -32,46 +32,71 @@ struct SubprocessTest : public testing::Test {
 
 // Run a command that fails and emits to stderr.
 TEST_F(SubprocessTest, BadCommandStderr) {
-  Subprocess* subproc = new Subprocess;
-  EXPECT_TRUE(subproc->Start(&subprocs_, "cmd /c ninja_no_such_command"));
-  subprocs_.Add(subproc);
+  Subprocess* subproc = subprocs_.Add("cmd /c ninja_no_such_command");
+  ASSERT_NE((Subprocess *) 0, subproc);
 
   while (!subproc->Done()) {
     // Pretend we discovered that stderr was ready for writing.
     subprocs_.DoWork();
   }
 
-  EXPECT_FALSE(subproc->Finish());
+  EXPECT_EQ(ExitFailure, subproc->Finish());
   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);
+  Subprocess* subproc = subprocs_.Add("ninja_no_such_command");
+  ASSERT_NE((Subprocess *) 0, subproc);
 
   while (!subproc->Done()) {
     // Pretend we discovered that stderr was ready for writing.
     subprocs_.DoWork();
   }
 
-  EXPECT_FALSE(subproc->Finish());
+  EXPECT_EQ(ExitFailure, subproc->Finish());
   EXPECT_NE("", subproc->GetOutput());
 #ifdef _WIN32
   ASSERT_EQ("CreateProcess failed: The system cannot find the file specified.\n", subproc->GetOutput());
 #endif
 }
 
+#ifndef _WIN32
+
+TEST_F(SubprocessTest, InterruptChild) {
+  Subprocess* subproc = subprocs_.Add("kill -INT $$");
+  ASSERT_NE((Subprocess *) 0, subproc);
+
+  while (!subproc->Done()) {
+    subprocs_.DoWork();
+  }
+
+  EXPECT_EQ(ExitInterrupted, subproc->Finish());
+}
+
+TEST_F(SubprocessTest, InterruptParent) {
+  Subprocess* subproc = subprocs_.Add("kill -INT $PPID ; sleep 1");
+  ASSERT_NE((Subprocess *) 0, subproc);
+
+  while (!subproc->Done()) {
+    bool interrupted = subprocs_.DoWork();
+    if (interrupted)
+      return;
+  }
+
+  ADD_FAILURE() << "We should have been interrupted";
+}
+
+#endif
+
 TEST_F(SubprocessTest, SetWithSingle) {
-  Subprocess* subproc = new Subprocess;
-  EXPECT_TRUE(subproc->Start(&subprocs_, kSimpleCommand));
-  subprocs_.Add(subproc);
+  Subprocess* subproc = subprocs_.Add(kSimpleCommand);
+  ASSERT_NE((Subprocess *) 0, subproc);
 
   while (!subproc->Done()) {
     subprocs_.DoWork();
   }
-  ASSERT_TRUE(subproc->Finish());
+  ASSERT_EQ(ExitSuccess, subproc->Finish());
   ASSERT_NE("", subproc->GetOutput());
 
   ASSERT_EQ(1u, subprocs_.finished_.size());
@@ -91,9 +116,8 @@ TEST_F(SubprocessTest, SetWithMulti) {
   };
 
   for (int i = 0; i < 3; ++i) {
-    processes[i] = new Subprocess;
-    EXPECT_TRUE(processes[i]->Start(&subprocs_, kCommands[i]));
-    subprocs_.Add(processes[i]);
+    processes[i] = subprocs_.Add(kCommands[i]);
+    ASSERT_NE((Subprocess *) 0, processes[i]);
   }
 
   ASSERT_EQ(3u, subprocs_.running_.size());
@@ -112,7 +136,7 @@ TEST_F(SubprocessTest, SetWithMulti) {
   ASSERT_EQ(3u, subprocs_.finished_.size());
 
   for (int i = 0; i < 3; ++i) {
-    ASSERT_TRUE(processes[i]->Finish());
+    ASSERT_EQ(ExitSuccess, processes[i]->Finish());
     ASSERT_NE("", processes[i]->GetOutput());
     delete processes[i];
   }