summaryrefslogtreecommitdiffstats
path: root/src/build_test.cc
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2013-04-22 00:55:10 (GMT)
committerNico Weber <nicolasweber@gmx.de>2013-04-22 00:56:43 (GMT)
commita83020b750e7b3c8c801fcf79ebe94d7dd4840dd (patch)
treef5ec3fc917cd9ae39935c93edaafdef67ea721a0 /src/build_test.cc
parentc57fd1a903cb342dc414307088352cdb550d3641 (diff)
downloadNinja-a83020b750e7b3c8c801fcf79ebe94d7dd4840dd.zip
Ninja-a83020b750e7b3c8c801fcf79ebe94d7dd4840dd.tar.gz
Ninja-a83020b750e7b3c8c801fcf79ebe94d7dd4840dd.tar.bz2
Don't record deps in dry runs.
deps_log() is NULL during dry runs, so this fixes a crash. It also matches ninja 1.2.0's behavior as far as I can tell. Fixes issue #551.
Diffstat (limited to 'src/build_test.cc')
-rw-r--r--src/build_test.cc31
1 files changed, 30 insertions, 1 deletions
diff --git a/src/build_test.cc b/src/build_test.cc
index 827998b..68a5142 100644
--- a/src/build_test.cc
+++ b/src/build_test.cc
@@ -1353,7 +1353,7 @@ TEST_F(BuildTest, PhonyWithNoInputs) {
ASSERT_EQ(1u, command_runner_.commands_ran_.size());
}
-TEST_F(BuildTest, DepsGccWithEmptyDeps) {
+TEST_F(BuildTest, DepsGccWithEmptyDepfileErrorsOut) {
ASSERT_NO_FATAL_FAILURE(AssertParse(&state_,
"rule cc\n"
" command = cc\n"
@@ -1554,3 +1554,32 @@ TEST_F(BuildWithDepsLogTest, ObsoleteDeps) {
builder.command_runner_.release();
}
}
+
+TEST_F(BuildWithDepsLogTest, DepsIgnoredInDryRun) {
+ const char* manifest =
+ "build out: cat in1\n"
+ " deps = gcc\n"
+ " depfile = in1.d\n";
+
+ fs_.Create("out", "");
+ fs_.Tick();
+ fs_.Create("in1", "");
+
+ State state;
+ ASSERT_NO_FATAL_FAILURE(AddCatRule(&state));
+ ASSERT_NO_FATAL_FAILURE(AssertParse(&state, manifest));
+
+ // The deps log is NULL in dry runs.
+ config_.dry_run = true;
+ Builder builder(&state, config_, NULL, NULL, &fs_);
+ builder.command_runner_.reset(&command_runner_);
+ command_runner_.commands_ran_.clear();
+
+ string err;
+ EXPECT_TRUE(builder.AddTarget("out", &err));
+ ASSERT_EQ("", err);
+ EXPECT_TRUE(builder.Build(&err));
+ ASSERT_EQ(1u, command_runner_.commands_ran_.size());
+
+ builder.command_runner_.release();
+}