summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2014-05-21 21:16:18 (GMT)
committerNico Weber <thakis@chromium.org>2014-05-21 21:16:18 (GMT)
commit9c3cada3bf6e56f5ab202689dd61bfff845795e8 (patch)
tree1ef8e32128f127211183caf25a11425c24b6e800
parentf70e4459d207f80be0ebbc2ba73bc28ac5042c5d (diff)
downloadNinja-9c3cada3bf6e56f5ab202689dd61bfff845795e8.zip
Ninja-9c3cada3bf6e56f5ab202689dd61bfff845795e8.tar.gz
Ninja-9c3cada3bf6e56f5ab202689dd61bfff845795e8.tar.bz2
CleanTest cleanups:
* $in only makes sense on rules, not edges (see issue #687) * Remove unneccesary clear() line at end of test
-rw-r--r--src/clean_test.cc8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/clean_test.cc b/src/clean_test.cc
index 04cff73..4a00fd8 100644
--- a/src/clean_test.cc
+++ b/src/clean_test.cc
@@ -286,8 +286,7 @@ TEST_F(CleanTest, CleanRspFile) {
" rspfile = $rspfile\n"
" rspfile_content=$in\n"
"build out1: cc in1\n"
-" rspfile = cc1.rsp\n"
-" rspfile_content=$in\n"));
+" rspfile = cc1.rsp\n"));
fs_.Create("out1", "");
fs_.Create("cc1.rsp", "");
@@ -307,10 +306,9 @@ TEST_F(CleanTest, CleanRsp) {
"build out1: cat in1\n"
"build in2: cat_rsp src2\n"
" rspfile=in2.rsp\n"
-" rspfile_content=$in\n"
"build out2: cat_rsp in2\n"
" rspfile=out2.rsp\n"
-" rspfile_content=$in\n"));
+));
fs_.Create("in1", "");
fs_.Create("out1", "");
fs_.Create("in2.rsp", "");
@@ -336,8 +334,6 @@ TEST_F(CleanTest, CleanRsp) {
EXPECT_EQ(0, fs_.Stat("out2"));
EXPECT_EQ(0, fs_.Stat("in2.rsp"));
EXPECT_EQ(0, fs_.Stat("out2.rsp"));
-
- fs_.files_removed_.clear();
}
TEST_F(CleanTest, CleanFailure) {