diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2011-11-25 15:18:49 (GMT) |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2011-12-06 09:07:45 (GMT) |
| commit | 722953d14c16596bf4316d3c6eda18b3a17eb693 (patch) | |
| tree | 1f6cce9ab49367de6827ca315c0fe45a5e4724d2 | |
| parent | 57d8557ff3bfe6772f2dbada1d1ffa5d378ca763 (diff) | |
| download | Ninja-722953d14c16596bf4316d3c6eda18b3a17eb693.zip Ninja-722953d14c16596bf4316d3c6eda18b3a17eb693.tar.gz Ninja-722953d14c16596bf4316d3c6eda18b3a17eb693.tar.bz2 | |
Have the clean tool remove depfiles
| -rw-r--r-- | src/clean.cc | 2 | ||||
| -rw-r--r-- | src/clean_test.cc | 15 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/clean.cc b/src/clean.cc index 033fa96..a89e1f5 100644 --- a/src/clean.cc +++ b/src/clean.cc @@ -111,6 +111,8 @@ int Cleaner::CleanAll(bool generator) { out_node != (*e)->outputs_.end(); ++out_node) { Remove((*out_node)->file_->path_); } + if (!(*e)->rule_->depfile_.empty()) + Remove((*e)->EvaluateDepFile()); } PrintFooter(); return status_; diff --git a/src/clean_test.cc b/src/clean_test.cc index 8606239..9cd4a95 100644 --- a/src/clean_test.cc +++ b/src/clean_test.cc @@ -234,6 +234,21 @@ TEST_F(CleanTest, CleanRuleGenerator) { EXPECT_EQ(2u, fs_.files_removed_.size()); } +TEST_F(CleanTest, CleanDepFile) { + ASSERT_NO_FATAL_FAILURE(AssertParse(&state_, +"rule cc\n" +" command = cc $in > $out\n" +" depfile = $out.d\n" +"build out1: cc in1\n")); + fs_.Create("out1", 1, ""); + fs_.Create("out1.d", 1, ""); + + Cleaner cleaner(&state_, config_, &fs_); + EXPECT_EQ(0, cleaner.CleanAll()); + EXPECT_EQ(2, cleaner.cleaned_files_count()); + EXPECT_EQ(2u, fs_.files_removed_.size()); +} + TEST_F(CleanTest, CleanFailure) { ASSERT_NO_FATAL_FAILURE(AssertParse(&state_, "build dir: cat src1\n")); |