diff options
author | Scott Graham <scottmg@chromium.org> | 2014-10-30 22:34:25 (GMT) |
---|---|---|
committer | Scott Graham <scottmg@chromium.org> | 2014-10-30 22:34:25 (GMT) |
commit | 65151e7eefce514febd0a9676c5363c6d4c54b66 (patch) | |
tree | 8458820f009b6a20b00adeb129d5055b281d2386 /src/manifest_parser_test.cc | |
parent | b92c1a4fd731df4c1a408023cd0d0b691bf79f2f (diff) | |
download | Ninja-65151e7eefce514febd0a9676c5363c6d4c54b66.zip Ninja-65151e7eefce514febd0a9676c5363c6d4c54b66.tar.gz Ninja-65151e7eefce514febd0a9676c5363c6d4c54b66.tar.bz2 |
CanonicalizePath handles \ on Windows
Diffstat (limited to 'src/manifest_parser_test.cc')
-rw-r--r-- | src/manifest_parser_test.cc | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/manifest_parser_test.cc b/src/manifest_parser_test.cc index 20168df..aa3e9e4 100644 --- a/src/manifest_parser_test.cc +++ b/src/manifest_parser_test.cc @@ -870,22 +870,18 @@ TEST_F(ParserTest, UTF8) { " description = compilaci\xC3\xB3\n")); } -// We might want to eventually allow CRLF to be nice to Windows developers, -// but for now just verify we error out with a nice message. TEST_F(ParserTest, CRLF) { State state; ManifestParser parser(&state, NULL); string err; - EXPECT_FALSE(parser.ParseTest("# comment with crlf\r\n", - &err)); - EXPECT_EQ("input:1: lexing error\n", - err); - - EXPECT_FALSE(parser.ParseTest("foo = foo\nbar = bar\r\n", - &err)); - EXPECT_EQ("input:2: carriage returns are not allowed, use newlines\n" - "bar = bar\r\n" - " ^ near here", - err); + EXPECT_TRUE(parser.ParseTest("# comment with crlf\r\n", &err)); + EXPECT_TRUE(parser.ParseTest("foo = foo\nbar = bar\r\n", &err)); + EXPECT_TRUE(parser.ParseTest( + "pool link_pool\r\n" + " depth = 15\r\n\r\n" + "rule xyz\r\n" + " command = something$expand \r\n" + " description = YAY!\r\n", + &err)); } |