diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build_test.cc | 25 | ||||
| -rw-r--r-- | src/graph.cc | 7 |
2 files changed, 28 insertions, 4 deletions
diff --git a/src/build_test.cc b/src/build_test.cc index ed9ade3..5089607 100644 --- a/src/build_test.cc +++ b/src/build_test.cc @@ -1604,7 +1604,30 @@ TEST_F(BuildWithDepsLogTest, DepsIgnoredInDryRun) { } /// Check that a restat rule generating a header cancels compilations correctly. -TEST_F(BuildWithDepsLogTest, RestatDepfileDependency) { +TEST_F(BuildTest, RestatDepfileDependency) { + ASSERT_NO_FATAL_FAILURE(AssertParse(&state_, +"rule true\n" +" command = true\n" // Would be "write if out-of-date" in reality. +" restat = 1\n" +"build header.h: true header.in\n" +"build out: cat in1\n" +" depfile = in1.d\n")); + + fs_.Create("header.h", ""); + fs_.Create("in1.d", "out: header.h"); + fs_.Tick(); + fs_.Create("header.in", ""); + + string err; + EXPECT_TRUE(builder_.AddTarget("out", &err)); + ASSERT_EQ("", err); + EXPECT_TRUE(builder_.Build(&err)); + EXPECT_EQ("", err); +} + +/// Check that a restat rule generating a header cancels compilations correctly, +/// depslog case. +TEST_F(BuildWithDepsLogTest, RestatDepfileDependencyDepsLog) { string err; // Note: in1 was created by the superclass SetUp(). const char* manifest = diff --git a/src/graph.cc b/src/graph.cc index 7a57753..fdd93de 100644 --- a/src/graph.cc +++ b/src/graph.cc @@ -417,9 +417,10 @@ bool ImplicitDepLoader::LoadDepsFromLog(Edge* edge, TimeStamp* deps_mtime, vector<Node*>::iterator implicit_dep = PreallocateSpace(edge, deps->node_count); for (int i = 0; i < deps->node_count; ++i, ++implicit_dep) { - *implicit_dep = deps->nodes[i]; - deps->nodes[i]->AddOutEdge(edge); - CreatePhonyInEdge(*implicit_dep); + Node* node = deps->nodes[i]; + *implicit_dep = node; + node->AddOutEdge(edge); + CreatePhonyInEdge(node); } return true; } |