summaryrefslogtreecommitdiffstats
path: root/src/test.cc
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2016-01-29 03:07:12 (GMT)
committerNico Weber <nicolasweber@gmx.de>2016-01-29 03:07:12 (GMT)
commit35e950d4c2d97d21ef7adf27cf6d003827e908ed (patch)
tree388c35ead599c61b9999aa55d7309661f7064f4a /src/test.cc
parent16553f76a68d12e0b48fad12f9a76861c14ffd35 (diff)
parent56bab441b70e6f09f3faf7936118c309f9ce48cb (diff)
downloadNinja-35e950d4c2d97d21ef7adf27cf6d003827e908ed.zip
Ninja-35e950d4c2d97d21ef7adf27cf6d003827e908ed.tar.gz
Ninja-35e950d4c2d97d21ef7adf27cf6d003827e908ed.tar.bz2
Merge pull request #1096 from sgraham/dupe-edge-action
dupe_edge_should_err from bool to enum
Diffstat (limited to 'src/test.cc')
-rw-r--r--src/test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test.cc b/src/test.cc
index 6548848..841ce04 100644
--- a/src/test.cc
+++ b/src/test.cc
@@ -95,7 +95,7 @@ Node* StateTestWithBuiltinRules::GetNode(const string& path) {
}
void AssertParse(State* state, const char* input) {
- ManifestParser parser(state, NULL, false);
+ ManifestParser parser(state, NULL, kDupeEdgeActionWarn);
string err;
EXPECT_TRUE(parser.ParseTest(input, &err));
ASSERT_EQ("", err);