summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2012-04-26 03:13:10 (GMT)
committerEvan Martin <martine@danga.com>2012-04-26 03:13:10 (GMT)
commitc2098f931b6d93b6eae406598e2b46c175bd969f (patch)
treebd6611e7b056b9a217de0b67fb7a3f1bcea62527
parent5d6249fa8c3d6241f46701f43fd48db576714ae4 (diff)
parent3353e5508614598ff18592bda55f68a6223911cf (diff)
downloadNinja-c2098f931b6d93b6eae406598e2b46c175bd969f.zip
Ninja-c2098f931b6d93b6eae406598e2b46c175bd969f.tar.gz
Ninja-c2098f931b6d93b6eae406598e2b46c175bd969f.tar.bz2
Merge branch 'dont-clean-phony' of git://github.com/pcc/ninja
Conflicts: src/clean.cc
-rw-r--r--src/clean.cc20
-rw-r--r--src/clean_test.cc25
2 files changed, 36 insertions, 9 deletions
diff --git a/src/clean.cc b/src/clean.cc
index c6a294f..3fe23ec 100644
--- a/src/clean.cc
+++ b/src/clean.cc
@@ -102,7 +102,7 @@ int Cleaner::CleanAll(bool generator) {
for (vector<Edge*>::iterator e = state_->edges_.begin();
e != state_->edges_.end(); ++e) {
// Do not try to remove phony targets
- if ((*e)->rule_ == &State::kPhonyRule)
+ if ((*e)->is_phony())
continue;
// Do not remove generator's files unless generator specified.
if (!generator && (*e)->rule().generator())
@@ -123,14 +123,16 @@ int Cleaner::CleanAll(bool generator) {
}
void Cleaner::DoCleanTarget(Node* target) {
- if (target->in_edge()) {
- Remove(target->path());
- if (!target->in_edge()->rule().depfile().empty())
- Remove(target->in_edge()->EvaluateDepFile());
- if (target->in_edge()->HasRspFile())
- Remove(target->in_edge()->GetRspFile());
- for (vector<Node*>::iterator n = target->in_edge()->inputs_.begin();
- n != target->in_edge()->inputs_.end();
+ if (Edge* e = target->in_edge()) {
+ // Do not try to remove phony targets
+ if (!e->is_phony()) {
+ Remove(target->path());
+ if (!target->in_edge()->rule().depfile().empty())
+ Remove(target->in_edge()->EvaluateDepFile());
+ if (e->HasRspFile())
+ Remove(e->GetRspFile());
+ }
+ for (vector<Node*>::iterator n = e->inputs_.begin(); n != e->inputs_.end();
++n) {
DoCleanTarget(*n);
}
diff --git a/src/clean_test.cc b/src/clean_test.cc
index 2e3a6b0..5ed48da 100644
--- a/src/clean_test.cc
+++ b/src/clean_test.cc
@@ -347,3 +347,28 @@ TEST_F(CleanTest, CleanFailure) {
Cleaner cleaner(&state_, config_, &fs_);
EXPECT_NE(0, cleaner.CleanAll());
}
+
+TEST_F(CleanTest, CleanPhony) {
+ ASSERT_NO_FATAL_FAILURE(AssertParse(&state_,
+"build phony: phony t1 t2\n"
+"build t1: cat\n"
+"build t2: cat\n"));
+
+ fs_.Create("phony", 1, "");
+ fs_.Create("t1", 1, "");
+ fs_.Create("t2", 1, "");
+
+ // Check that CleanAll does not remove "phony".
+ Cleaner cleaner(&state_, config_, &fs_);
+ EXPECT_EQ(0, cleaner.CleanAll());
+ EXPECT_EQ(2, cleaner.cleaned_files_count());
+ EXPECT_NE(0, fs_.Stat("phony"));
+
+ fs_.Create("t1", 1, "");
+ fs_.Create("t2", 1, "");
+
+ // Check that CleanTarget does not remove "phony".
+ EXPECT_EQ(0, cleaner.CleanTarget("phony"));
+ EXPECT_EQ(2, cleaner.cleaned_files_count());
+ EXPECT_NE(0, fs_.Stat("phony"));
+}