diff options
author | Nico Weber <nicolasweber@gmx.de> | 2014-05-21 21:17:44 (GMT) |
---|---|---|
committer | Nico Weber <nicolasweber@gmx.de> | 2014-05-21 21:17:44 (GMT) |
commit | 7103c32646df958b0287c65b1c660bf528a191d6 (patch) | |
tree | 1ef8e32128f127211183caf25a11425c24b6e800 | |
parent | f70e4459d207f80be0ebbc2ba73bc28ac5042c5d (diff) | |
parent | 9c3cada3bf6e56f5ab202689dd61bfff845795e8 (diff) | |
download | Ninja-7103c32646df958b0287c65b1c660bf528a191d6.zip Ninja-7103c32646df958b0287c65b1c660bf528a191d6.tar.gz Ninja-7103c32646df958b0287c65b1c660bf528a191d6.tar.bz2 |
Merge pull request #766 from nico/cleanup
CleanTest cleanups:
-rw-r--r-- | src/clean_test.cc | 8 |
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) { |