diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2019-12-10 14:29:39 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2019-12-20 12:13:57 +0000 |
| commit | 8da0a5162d11e03c745e81a6ad05ba7fc071ff62 (patch) | |
| tree | 5af4206a26ac4787af4950d01838360701d76f8b /ninja/src/manifest_parser_test.cc | |
| parent | cfab9198a9917f42cf08b1caf84ab9b71aac1911 (diff) | |
Downgrade ninja to 1.8.2
Ninja 1.9 introduces ns timestamps which make uneccessery rebuilds
(at least on windows) for targets which depens on files created
with shutil.copy2 from python2.
Change-Id: I603f9bff9cbd3b9da6b7f50fc6fa1ddbbcbb41d2
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'ninja/src/manifest_parser_test.cc')
| -rw-r--r-- | ninja/src/manifest_parser_test.cc | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/ninja/src/manifest_parser_test.cc b/ninja/src/manifest_parser_test.cc index c91d8d156ce..39ed810658a 100644 --- a/ninja/src/manifest_parser_test.cc +++ b/ninja/src/manifest_parser_test.cc @@ -523,7 +523,7 @@ TEST_F(ParserTest, Errors) { EXPECT_FALSE(parser.ParseTest("build x: y z\n", &err)); EXPECT_EQ("input:1: unknown build rule 'y'\n" "build x: y z\n" - " ^ near here" + " ^ near here" , err); } @@ -534,7 +534,7 @@ TEST_F(ParserTest, Errors) { EXPECT_FALSE(parser.ParseTest("build x:: y z\n", &err)); EXPECT_EQ("input:1: expected build command name\n" "build x:: y z\n" - " ^ near here" + " ^ near here" , err); } @@ -636,10 +636,7 @@ TEST_F(ParserTest, Errors) { string err; EXPECT_FALSE(parser.ParseTest("rule %foo\n", &err)); - EXPECT_EQ("input:1: expected rule name\n" - "rule %foo\n" - " ^ near here", - err); + EXPECT_EQ("input:1: expected rule name\n", err); } { @@ -675,10 +672,7 @@ TEST_F(ParserTest, Errors) { string err; EXPECT_FALSE(parser.ParseTest("rule cc\n command = foo\n && bar", &err)); - EXPECT_EQ("input:3: expected variable name\n" - " && bar\n" - " ^ near here", - err); + EXPECT_EQ("input:3: expected variable name\n", err); } { @@ -773,9 +767,7 @@ TEST_F(ParserTest, Errors) { ManifestParser parser(&local_state, NULL); string err; EXPECT_FALSE(parser.ParseTest("pool\n", &err)); - EXPECT_EQ("input:1: expected pool name\n" - "pool\n" - " ^ near here", err); + EXPECT_EQ("input:1: expected pool name\n", err); } { |