diff options
author | Brad King <brad.king@kitware.com> | 2016-02-03 18:44:46 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-02-03 18:44:46 (GMT) |
commit | e74cefa6c606d69ddfd6bc9b055ef0c697c4f29a (patch) | |
tree | 76e4dc7793b5c6f2bc09fe2a8c5ddb8a65d7981d /src/manifest_parser_perftest.cc | |
parent | 858386d8415d2ee932fe3c01ebfbe5e0737f94a3 (diff) | |
download | Ninja-e74cefa6c606d69ddfd6bc9b055ef0c697c4f29a.zip Ninja-e74cefa6c606d69ddfd6bc9b055ef0c697c4f29a.tar.gz Ninja-e74cefa6c606d69ddfd6bc9b055ef0c697c4f29a.tar.bz2 |
Replace ManifestParser::FileReader with general FileReader
Avoid having two separate filesystem interfaces. Simplify test
infrastructure by avoiding custom `ManifestParser::FileReader`
implementations.
Diffstat (limited to 'src/manifest_parser_perftest.cc')
-rw-r--r-- | src/manifest_parser_perftest.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/manifest_parser_perftest.cc b/src/manifest_parser_perftest.cc index ef3b663..572e2d5 100644 --- a/src/manifest_parser_perftest.cc +++ b/src/manifest_parser_perftest.cc @@ -36,12 +36,6 @@ #include "state.h" #include "util.h" -struct RealFileReader : public ManifestParser::FileReader { - virtual bool ReadFile(const string& path, string* content, string* err) { - return ::ReadFile(path, content, err) == 0; - } -}; - bool WriteFakeManifests(const string& dir, string* err) { RealDiskInterface disk_interface; TimeStamp mtime = disk_interface.Stat(dir + "/build.ninja", err); @@ -59,9 +53,9 @@ bool WriteFakeManifests(const string& dir, string* err) { int LoadManifests(bool measure_command_evaluation) { string err; - RealFileReader file_reader; + RealDiskInterface disk_interface; State state; - ManifestParser parser(&state, &file_reader, kDupeEdgeActionWarn); + ManifestParser parser(&state, &disk_interface, kDupeEdgeActionWarn); if (!parser.Load("build.ninja", &err)) { fprintf(stderr, "Failed to read test data: %s\n", err.c_str()); exit(1); |