From 36aa519f52c7ff443cc7f2a43283a5d4c0807639 Mon Sep 17 00:00:00 2001 From: Scott Graham Date: Fri, 15 Jun 2012 14:57:22 -0700 Subject: improve test --- src/parsers_test.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/parsers_test.cc b/src/parsers_test.cc index 3cb16a7..fc83946 100644 --- a/src/parsers_test.cc +++ b/src/parsers_test.cc @@ -115,22 +115,21 @@ TEST_F(ParserTest, ResponseFiles) { EXPECT_EQ("[$in]", rule->rspfile_content().Serialize()); } -TEST_F(ParserTest, ResponseFilesInNewline) { +TEST_F(ParserTest, InNewline) { ASSERT_NO_FATAL_FAILURE(AssertParse( "rule cat_rsp\n" -" command = cat $rspfile > $out\n" -" rspfile = $rspfile\n" -" rspfile_content = $in_newline\n" +" command = cat $in_newline > $out\n" "\n" -"build out: cat_rsp in\n" +"build out: cat_rsp in in2\n" " rspfile=out.rsp\n")); ASSERT_EQ(2u, state.rules_.size()); const Rule* rule = state.rules_.begin()->second; EXPECT_EQ("cat_rsp", rule->name()); - EXPECT_EQ("[cat ][$rspfile][ > ][$out]", rule->command().Serialize()); - EXPECT_EQ("[$rspfile]", rule->rspfile().Serialize()); - EXPECT_EQ("[$in_newline]", rule->rspfile_content().Serialize()); + EXPECT_EQ("[cat ][$in_newline][ > ][$out]", rule->command().Serialize()); + + Edge* edge = state.edges_[0]; + EXPECT_EQ("cat in\nin2 > out", edge->EvaluateCommand()); } TEST_F(ParserTest, Variables) { -- cgit v0.12