summaryrefslogtreecommitdiffstats
path: root/src/clean_test.cc
diff options
context:
space:
mode:
authorNicolas Despres <nicolas.despres@gmail.com>2011-05-02 14:46:31 (GMT)
committerNicolas Despres <nicolas.despres@gmail.com>2011-05-02 15:21:21 (GMT)
commit9412cb05008437b2ce534871ec86772b107ce23c (patch)
tree6f4c1eac7f0d6e4608d398b5f415b60c93a780e1 /src/clean_test.cc
parent5113d8c29f2e165dabb05c5624055020704ba5fc (diff)
downloadNinja-9412cb05008437b2ce534871ec86772b107ce23c.zip
Ninja-9412cb05008437b2ce534871ec86772b107ce23c.tar.gz
Ninja-9412cb05008437b2ce534871ec86772b107ce23c.tar.bz2
Return non-zero status when errors occur.
Clean all was not returning non-zero when an error occur (like when failing to remove a directory). This patch fix the problem and add a test for it.
Diffstat (limited to 'src/clean_test.cc')
-rw-r--r--src/clean_test.cc16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/clean_test.cc b/src/clean_test.cc
index 0e2114e..d16941c 100644
--- a/src/clean_test.cc
+++ b/src/clean_test.cc
@@ -40,7 +40,7 @@ TEST_F(CleanTest, CleanAll) {
Cleaner cleaner(&state_, config_, &fs_);
ASSERT_EQ(0, cleaner.cleaned_files_count());
- cleaner.CleanAll();
+ EXPECT_EQ(0, cleaner.CleanAll());
EXPECT_EQ(4, cleaner.cleaned_files_count());
EXPECT_EQ(4, fs_.files_removed_.size());
}
@@ -56,7 +56,7 @@ TEST_F(CleanTest, CleanAll) {
Cleaner cleaner(&state_, config_, &fs_);
ASSERT_EQ(0, cleaner.cleaned_files_count());
- cleaner.CleanAll();
+ EXPECT_EQ(0, cleaner.CleanAll());
EXPECT_EQ(0, cleaner.cleaned_files_count());
EXPECT_EQ(0, fs_.files_removed_.size());
}
@@ -78,7 +78,7 @@ TEST_F(CleanTest, CleanAllDryRun) {
Cleaner cleaner(&state_, config_, &fs_);
ASSERT_EQ(0, cleaner.cleaned_files_count());
- cleaner.CleanAll();
+ EXPECT_EQ(0, cleaner.CleanAll());
EXPECT_EQ(4, cleaner.cleaned_files_count());
EXPECT_EQ(0, fs_.files_removed_.size());
}
@@ -94,7 +94,7 @@ TEST_F(CleanTest, CleanAllDryRun) {
Cleaner cleaner(&state_, config_, &fs_);
ASSERT_EQ(0, cleaner.cleaned_files_count());
- cleaner.CleanAll();
+ EXPECT_EQ(0, cleaner.CleanAll());
EXPECT_EQ(4, cleaner.cleaned_files_count());
EXPECT_EQ(0, fs_.files_removed_.size());
}
@@ -253,3 +253,11 @@ TEST_F(CleanTest, CleanRuleDryRun) {
EXPECT_EQ(0, fs_.files_removed_.size());
}
}
+
+TEST_F(CleanTest, CleanFailure) {
+ ASSERT_NO_FATAL_FAILURE(AssertParse(&state_,
+ "build dir: cat src1\n"));
+ fs_.MakeDir("dir");
+ Cleaner cleaner(&state_, config_, &fs_);
+ EXPECT_NE(0, cleaner.CleanAll());
+}