summaryrefslogtreecommitdiffstats
path: root/src/parsers_test.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-05-22 16:25:34 (GMT)
committerEvan Martin <martine@danga.com>2011-05-22 16:26:06 (GMT)
commite69d8bfda4b369717e67ff1d9bfa458b402c0e73 (patch)
tree8ee484567fc00f889fb82d7104b6a360d70daa4b /src/parsers_test.cc
parentc1b5ace19665ee154add5fbe47faf45f16ce619e (diff)
downloadNinja-e69d8bfda4b369717e67ff1d9bfa458b402c0e73.zip
Ninja-e69d8bfda4b369717e67ff1d9bfa458b402c0e73.tar.gz
Ninja-e69d8bfda4b369717e67ff1d9bfa458b402c0e73.tar.bz2
include filename in subninja load err message
Diffstat (limited to 'src/parsers_test.cc')
-rw-r--r--src/parsers_test.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/parsers_test.cc b/src/parsers_test.cc
index 0ffd69e..f21cccf 100644
--- a/src/parsers_test.cc
+++ b/src/parsers_test.cc
@@ -32,7 +32,7 @@ struct ParserTest : public testing::Test,
files_read_.push_back(path);
map<string, string>::iterator i = files_.find(path);
if (i == files_.end()) {
- *err = "file not found";
+ *err = "No such file or directory"; // Match strerror() for ENOENT.
return false;
}
*content = i->second;
@@ -335,6 +335,14 @@ TEST_F(ParserTest, SubNinja) {
EXPECT_EQ("varref outer", state.edges_[2]->EvaluateCommand());
}
+TEST_F(ParserTest, MissingSubNinja) {
+ ManifestParser parser(&state, this);
+ string err;
+ EXPECT_FALSE(parser.Parse("subninja foo.ninja\n", &err));
+ EXPECT_EQ("line 1, col 10: loading foo.ninja: No such file or directory",
+ err);
+}
+
TEST_F(ParserTest, Include) {
files_["include.ninja"] = "var = inner\n";
ASSERT_NO_FATAL_FAILURE(AssertParse(