summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2016-02-03 20:47:56 (GMT)
committerNico Weber <nicolasweber@gmx.de>2016-02-03 20:47:56 (GMT)
commit7d8f9ef43e261724be256ae69b1642b6729f776a (patch)
treeac67b9b77d23fc342d5c28c2942698c707ea082d
parentf1f3f494f5f67a4cd64b0cddaad472b070f6db07 (diff)
parent94086e990cac21451a98d949afec0b705b1c4d88 (diff)
downloadNinja-7d8f9ef43e261724be256ae69b1642b6729f776a.zip
Ninja-7d8f9ef43e261724be256ae69b1642b6729f776a.tar.gz
Ninja-7d8f9ef43e261724be256ae69b1642b6729f776a.tar.bz2
Merge pull request #1099 from bradking/fix-perftest-compilation
perftest: fix compilation after dupe_edge_should_err change
-rw-r--r--src/build_log_perftest.cc2
-rw-r--r--src/manifest_parser_perftest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/build_log_perftest.cc b/src/build_log_perftest.cc
index 810c065..185c512 100644
--- a/src/build_log_perftest.cc
+++ b/src/build_log_perftest.cc
@@ -71,7 +71,7 @@ bool WriteTestData(string* err) {
long_rule_command += "$in -o $out\n";
State state;
- ManifestParser parser(&state, NULL);
+ ManifestParser parser(&state, NULL, kDupeEdgeActionWarn);
if (!parser.ParseTest("rule cxx\n command = " + long_rule_command, err))
return false;
diff --git a/src/manifest_parser_perftest.cc b/src/manifest_parser_perftest.cc
index 6b56ab0..ef3b663 100644
--- a/src/manifest_parser_perftest.cc
+++ b/src/manifest_parser_perftest.cc
@@ -61,7 +61,7 @@ int LoadManifests(bool measure_command_evaluation) {
string err;
RealFileReader file_reader;
State state;
- ManifestParser parser(&state, &file_reader);
+ ManifestParser parser(&state, &file_reader, kDupeEdgeActionWarn);
if (!parser.Load("build.ninja", &err)) {
fprintf(stderr, "Failed to read test data: %s\n", err.c_str());
exit(1);