summaryrefslogtreecommitdiffstats
path: root/src/build_test.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-09-04 22:39:04 (GMT)
committerEvan Martin <martine@danga.com>2012-09-04 22:39:04 (GMT)
commit1e11c8a6bd119025efd8725370ffa42354f92f88 (patch)
tree53adfbd3d97d14a84bc9e0657e85569d0d547a11 /src/build_test.cc
parent703dcffd6d2e4b64411eb44d3025093abfd1d737 (diff)
downloadNinja-1e11c8a6bd119025efd8725370ffa42354f92f88.zip
Ninja-1e11c8a6bd119025efd8725370ffa42354f92f88.tar.gz
Ninja-1e11c8a6bd119025efd8725370ffa42354f92f88.tar.bz2
move BuildLog to DependencyScan
The build log is needed in computing whether an edge is dirty, so I think it belongs here. (It's a bit weird that Builder needs to reach into it to record completed commands, maybe it will become cleaner with more thought.)
Diffstat (limited to 'src/build_test.cc')
-rw-r--r--src/build_test.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/build_test.cc b/src/build_test.cc
index d4673ae..859e758 100644
--- a/src/build_test.cc
+++ b/src/build_test.cc
@@ -178,7 +178,8 @@ TEST_F(PlanTest, DependencyCycle) {
struct BuildTest : public StateTestWithBuiltinRules,
public CommandRunner {
- BuildTest() : config_(MakeConfig()), builder_(&state_, config_, &fs_),
+ BuildTest() : config_(MakeConfig()),
+ builder_(&state_, config_, NULL, &fs_),
now_(1), last_command_(NULL), status_(config_) {
builder_.command_runner_.reset(this);
AssertParse(&state_,
@@ -717,7 +718,7 @@ TEST_F(BuildTest, SwallowFailuresLimit) {
struct BuildWithLogTest : public BuildTest {
BuildWithLogTest() {
- state_.build_log_ = builder_.log_ = &build_log_;
+ builder_.SetBuildLog(&build_log_);
}
BuildLog build_log_;