summaryrefslogtreecommitdiffstats
path: root/src/build_test.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-05-14 22:17:50 (GMT)
committerEvan Martin <martine@danga.com>2011-05-14 22:48:10 (GMT)
commit1493723cbbc97139e1161fa0351e02ac8ce2e9a0 (patch)
tree8314745a0c0d583bd81fbcb489d72a21edc9ce0e /src/build_test.cc
parent9ceea1f592a232d91fb0215fa901e168c9620ad7 (diff)
downloadNinja-1493723cbbc97139e1161fa0351e02ac8ce2e9a0.zip
Ninja-1493723cbbc97139e1161fa0351e02ac8ce2e9a0.tar.gz
Ninja-1493723cbbc97139e1161fa0351e02ac8ce2e9a0.tar.bz2
refactor status printing into BuildStatus
Centralizing printing allows being more careful about what is output. 1) Always include the [2/15] prefix on commands. 2) Make the header command match the error output command.
Diffstat (limited to 'src/build_test.cc')
-rw-r--r--src/build_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/build_test.cc b/src/build_test.cc
index a7eca14..8530c73 100644
--- a/src/build_test.cc
+++ b/src/build_test.cc
@@ -211,7 +211,7 @@ struct BuildTest : public StateTestWithBuiltinRules,
virtual bool CanRunMore();
virtual bool StartCommand(Edge* edge);
virtual bool WaitForCommands();
- virtual Edge* NextFinishedCommand(bool* success);
+ virtual Edge* NextFinishedCommand(bool* success, string* output);
BuildConfig MakeConfig() {
BuildConfig config;
@@ -269,7 +269,7 @@ bool BuildTest::WaitForCommands() {
return true;
}
-Edge* BuildTest::NextFinishedCommand(bool* success) {
+Edge* BuildTest::NextFinishedCommand(bool* success, string* output) {
if (Edge* edge = last_command_) {
if (edge->rule_->name_ == "fail")
*success = false;