pass command results via a struct

WaitForCommand now passes all command output via a struct.
This will allow adding more output in a future change.

1 files changed, 18 insertions, 17 deletions

diff --git a/src/build_test.cc b/src/build_test.cc
index d4468a3..a74beb9 100644
--- a/src/build_test.cc
+++ b/src/build_test.cc
@@ -383,7 +383,7 @@ struct FakeCommandRunner : public CommandRunner {
   // CommandRunner impl
   virtual bool CanRunMore();
   virtual bool StartCommand(Edge* edge);
-  virtual Edge* WaitForCommand(ExitStatus* status, string* output);
+  virtual bool WaitForCommand(Result* result);
   virtual vector<Edge*> GetActiveEdges();
   virtual void Abort();
 
@@ -457,24 +457,25 @@ bool FakeCommandRunner::StartCommand(Edge* edge) {
   return true;
 }
 
-Edge* FakeCommandRunner::WaitForCommand(ExitStatus* status,
-                                        string* /* output */) {
-  if (Edge* edge = last_command_) {
-    if (edge->rule().name() == "interrupt" ||
-        edge->rule().name() == "touch-interrupt") {
-      *status = ExitInterrupted;
-      return NULL;
-    }
+bool FakeCommandRunner::WaitForCommand(Result* result) {
+  if (!last_command_)
+    return false;
 
-    if (edge->rule().name() == "fail")
-      *status = ExitFailure;
-    else
-      *status = ExitSuccess;
-    last_command_ = NULL;
-    return edge;
+  Edge* edge = last_command_;
+  result->edge = edge;
+
+  if (edge->rule().name() == "interrupt" ||
+      edge->rule().name() == "touch-interrupt") {
+    result->status = ExitInterrupted;
+    return true;
   }
-  *status = ExitFailure;
-  return NULL;
+
+  if (edge->rule().name() == "fail")
+    result->status = ExitFailure;
+  else
+    result->status = ExitSuccess;
+  last_command_ = NULL;
+  return true;
 }
 
 vector<Edge*> FakeCommandRunner::GetActiveEdges() {