diff options
author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-10-09 13:26:28 +0300 |
---|---|---|
committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2019-10-09 14:35:08 +0300 |
commit | b4e0224a5786f1d362b2b6b7e7f536be8bb98981 (patch) | |
tree | 9571c0aac878b7fff55ccff11726bcc73093fa81 /render-test/parser.cpp | |
parent | d0281e3ca4686ca52b1b4d886dad4e8de27bdcfa (diff) | |
download | qtlocation-mapboxgl-b4e0224a5786f1d362b2b6b7e7f536be8bb98981.tar.gz |
[test runner] Fix finding of expected images paths
Before this change, the found paths to the expected images
erroneously included the path to the `metrics.json` file
(if this file was present) leading to raising of an
unhandled exception.
Diffstat (limited to 'render-test/parser.cpp')
-rw-r--r-- | render-test/parser.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/render-test/parser.cpp b/render-test/parser.cpp index 802c3c7f55..024adf91d1 100644 --- a/render-test/parser.cpp +++ b/render-test/parser.cpp @@ -291,9 +291,8 @@ std::string serializeMetrics(const TestMetrics& metrics) { return s.GetString(); } -std::vector<std::string> readExpectedEntries(const mbgl::filesystem::path& base) { - static const std::regex regex(".*expected.*.png|.*expected.*.json"); - +namespace { +std::vector<std::string> readExpectedEntries(const std::regex& regex, const mbgl::filesystem::path& base) { std::vector<std::string> expectedImages; for (const auto& entry : mbgl::filesystem::directory_iterator(base)) { if (entry.is_regular_file()) { @@ -305,7 +304,17 @@ std::vector<std::string> readExpectedEntries(const mbgl::filesystem::path& base) } return expectedImages; } +} // namespace + +std::vector<std::string> readExpectedImageEntries(const mbgl::filesystem::path& base) { + static const std::regex regex(".*expected.*.png"); + return readExpectedEntries(regex, base); +} +std::vector<std::string> readExpectedJSONEntries(const mbgl::filesystem::path& base) { + static const std::regex regex(".*expected.*.json"); + return readExpectedEntries(regex, base); +} ArgumentsTuple parseArguments(int argc, char** argv) { args::ArgumentParser argumentParser("Mapbox GL Test Runner"); |