diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2015-03-24 01:18:01 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2015-03-24 01:18:01 (GMT) |
| commit | d209733d66b5e537e2522891c51d34b5262b4de9 (patch) | |
| tree | 91a72945cd3a07ebe6321d9fe6b516c05030621a /src/manifest_parser.cc | |
| parent | 96d873e6efb5da29a683ff48294c2216a52e34c1 (diff) | |
| download | Ninja-d209733d66b5e537e2522891c51d34b5262b4de9.zip Ninja-d209733d66b5e537e2522891c51d34b5262b4de9.tar.gz Ninja-d209733d66b5e537e2522891c51d34b5262b4de9.tar.bz2 | |
Make tests quiet again.
Diffstat (limited to 'src/manifest_parser.cc')
| -rw-r--r-- | src/manifest_parser.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/manifest_parser.cc b/src/manifest_parser.cc index ede5adb..638d751 100644 --- a/src/manifest_parser.cc +++ b/src/manifest_parser.cc @@ -25,7 +25,7 @@ #include "version.h" ManifestParser::ManifestParser(State* state, FileReader* file_reader) - : state_(state), file_reader_(file_reader) { + : state_(state), file_reader_(file_reader), quiet_(false) { env_ = &state->bindings_; } @@ -329,10 +329,12 @@ bool ManifestParser::ParseEdge(string* err) { if (!CanonicalizePath(&path, &slash_bits, &path_err)) return lexer_.Error(path_err, err); if (!state_->AddOut(edge, path, slash_bits)) { - Warning("multiple rules generate %s. " - "builds involving this target will not be correct; " - "continuing anyway", - path.c_str()); + if (!quiet_) { + Warning("multiple rules generate %s. " + "builds involving this target will not be correct; " + "continuing anyway", + path.c_str()); + } } } if (edge->outputs_.empty()) { |