diff options
| author | Evan Martin <martine@danga.com> | 2011-02-05 19:32:40 (GMT) |
|---|---|---|
| committer | Evan Martin <martine@danga.com> | 2011-02-05 19:34:22 (GMT) |
| commit | 6b7830d23afba1ca252e46b1393d3b1d439a7193 (patch) | |
| tree | 857d1304ea69e65db2711fbf6828d2b7fc362c26 /src/build.cc | |
| parent | b9a26e0e5d1045f5814e3ce6341647c92045e3c3 (diff) | |
| download | Ninja-6b7830d23afba1ca252e46b1393d3b1d439a7193.zip Ninja-6b7830d23afba1ca252e46b1393d3b1d439a7193.tar.gz Ninja-6b7830d23afba1ca252e46b1393d3b1d439a7193.tar.bz2 | |
include command name when printing output, add newline
Diffstat (limited to 'src/build.cc')
| -rw-r--r-- | src/build.cc | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/build.cc b/src/build.cc index b380845..254d4dc 100644 --- a/src/build.cc +++ b/src/build.cc @@ -268,12 +268,16 @@ Edge* RealCommandRunner::NextFinishedCommand(bool* success) { Edge* edge = i->second; subproc_to_edge_.erase(i); - if (!*success) - printf("FAILED: %s\n", edge->EvaluateCommand().c_str()); - if (!subproc->stdout_.buf_.empty()) - printf("%s\n", subproc->stdout_.buf_.c_str()); - if (!subproc->stderr_.buf_.empty()) - printf("%s\n", subproc->stderr_.buf_.c_str()); + if (!*success || + !subproc->stdout_.buf_.empty() || + !subproc->stderr_.buf_.empty()) { + printf("\n%s%s\n", *success ? "" : "FAILED: ", + edge->EvaluateCommand().c_str()); + if (!subproc->stdout_.buf_.empty()) + printf("%s\n", subproc->stdout_.buf_.c_str()); + if (!subproc->stderr_.buf_.empty()) + printf("%s\n", subproc->stderr_.buf_.c_str()); + } delete subproc; return edge; |