summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2014-09-19 04:25:32 (GMT)
committerNico Weber <nicolasweber@gmx.de>2014-09-19 04:25:32 (GMT)
commit213c44a51c1309f0b03a7c2763a7599c8cb9a41f (patch)
treefd9bd9ab4b5a973b0f777947093d3b6b949cbf6c
parent2b63e14756f4b6132341e842fed26f034a921438 (diff)
downloadNinja-213c44a51c1309f0b03a7c2763a7599c8cb9a41f.zip
Ninja-213c44a51c1309f0b03a7c2763a7599c8cb9a41f.tar.gz
Ninja-213c44a51c1309f0b03a7c2763a7599c8cb9a41f.tar.bz2
Don't print "Recompacting..." message from tests.
Now tests don't print anything. Non-test behavior is unchanged.
-rw-r--r--src/build_log.cc5
-rw-r--r--src/build_log.h2
-rw-r--r--src/build_log_test.cc1
-rw-r--r--src/deps_log.cc3
-rw-r--r--src/deps_log.h4
-rw-r--r--src/deps_log_test.cc2
6 files changed, 13 insertions, 4 deletions
diff --git a/src/build_log.cc b/src/build_log.cc
index 3f24c16..b6f9874 100644
--- a/src/build_log.cc
+++ b/src/build_log.cc
@@ -102,7 +102,7 @@ BuildLog::LogEntry::LogEntry(const string& output, uint64_t command_hash,
{}
BuildLog::BuildLog()
- : log_file_(NULL), needs_recompaction_(false) {}
+ : log_file_(NULL), needs_recompaction_(false), quiet_(false) {}
BuildLog::~BuildLog() {
Close();
@@ -354,7 +354,8 @@ bool BuildLog::WriteEntry(FILE* f, const LogEntry& entry) {
bool BuildLog::Recompact(const string& path, const BuildLogUser& user,
string* err) {
METRIC_RECORD(".ninja_log recompact");
- printf("Recompacting log...\n");
+ if (!quiet_)
+ printf("Recompacting log...\n");
Close();
string temp_path = path + ".recompact";
diff --git a/src/build_log.h b/src/build_log.h
index fe81a85..db0cfe0 100644
--- a/src/build_log.h
+++ b/src/build_log.h
@@ -80,6 +80,7 @@ struct BuildLog {
/// Rewrite the known log entries, throwing away old data.
bool Recompact(const string& path, const BuildLogUser& user, string* err);
+ void set_quiet(bool quiet) { quiet_ = quiet; }
typedef ExternalStringHashMap<LogEntry*>::Type Entries;
const Entries& entries() const { return entries_; }
@@ -88,6 +89,7 @@ struct BuildLog {
Entries entries_;
FILE* log_file_;
bool needs_recompaction_;
+ bool quiet_;
};
#endif // NINJA_BUILD_LOG_H_
diff --git a/src/build_log_test.cc b/src/build_log_test.cc
index 2c41ba6..7ea2117 100644
--- a/src/build_log_test.cc
+++ b/src/build_log_test.cc
@@ -290,6 +290,7 @@ TEST_F(BuildLogRecompactTest, Recompact) {
ASSERT_TRUE(log2.LookupByOutput("out"));
ASSERT_TRUE(log2.LookupByOutput("out2"));
// ...and force a recompaction.
+ log2.set_quiet(true);
EXPECT_TRUE(log2.OpenForWrite(kTestFilename, *this, &err));
log2.Close();
diff --git a/src/deps_log.cc b/src/deps_log.cc
index 61df387..39de180 100644
--- a/src/deps_log.cc
+++ b/src/deps_log.cc
@@ -302,7 +302,8 @@ DepsLog::Deps* DepsLog::GetDeps(Node* node) {
bool DepsLog::Recompact(const string& path, string* err) {
METRIC_RECORD(".ninja_deps recompact");
- printf("Recompacting deps...\n");
+ if (!quiet_)
+ printf("Recompacting deps...\n");
Close();
string temp_path = path + ".recompact";
diff --git a/src/deps_log.h b/src/deps_log.h
index cec0257..9b81bc1 100644
--- a/src/deps_log.h
+++ b/src/deps_log.h
@@ -64,7 +64,7 @@ struct State;
/// wins, allowing updates to just be appended to the file. A separate
/// repacking step can run occasionally to remove dead records.
struct DepsLog {
- DepsLog() : needs_recompaction_(false), file_(NULL) {}
+ DepsLog() : needs_recompaction_(false), quiet_(false), file_(NULL) {}
~DepsLog();
// Writing (build-time) interface.
@@ -87,6 +87,7 @@ struct DepsLog {
/// Rewrite the known log entries, throwing away old data.
bool Recompact(const string& path, string* err);
+ void set_quiet(bool quiet) { quiet_ = quiet; }
/// Returns if the deps entry for a node is still reachable from the manifest.
///
@@ -108,6 +109,7 @@ struct DepsLog {
bool RecordId(Node* node);
bool needs_recompaction_;
+ bool quiet_;
FILE* file_;
/// Maps id -> Node.
diff --git a/src/deps_log_test.cc b/src/deps_log_test.cc
index 30cada2..60ff48f 100644
--- a/src/deps_log_test.cc
+++ b/src/deps_log_test.cc
@@ -252,6 +252,7 @@ TEST_F(DepsLogTest, Recompact) {
ASSERT_EQ("foo.h", deps->nodes[0]->path());
ASSERT_EQ("baz.h", deps->nodes[1]->path());
+ log.set_quiet(true);
ASSERT_TRUE(log.Recompact(kTestFilename, &err));
// The in-memory deps graph should still be valid after recompaction.
@@ -301,6 +302,7 @@ TEST_F(DepsLogTest, Recompact) {
ASSERT_EQ("foo.h", deps->nodes[0]->path());
ASSERT_EQ("baz.h", deps->nodes[1]->path());
+ log.set_quiet(true);
ASSERT_TRUE(log.Recompact(kTestFilename, &err));
// The previous entries should have been removed.