diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-11-27 15:56:03 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-11-27 18:32:58 +0200 |
commit | 09b724ea3362cafb302307d311553374e7aafc75 (patch) | |
tree | de162d337cf47634ba223a76ec134e91a5d74805 /render-test | |
parent | 2a65301f0990825dbcaf11c4a88e08dc974a511a (diff) | |
download | qtlocation-mapboxgl-09b724ea3362cafb302307d311553374e7aafc75.tar.gz |
[render-test] Fix regex matching the directory name
This code was matching `style.json` instead of `metrics.json` if
the `style.json` was contained inside `metrics/.../style.json`.
Diffstat (limited to 'render-test')
-rw-r--r-- | render-test/parser.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/render-test/parser.cpp b/render-test/parser.cpp index b5f4f9e759..093d4b37f9 100644 --- a/render-test/parser.cpp +++ b/render-test/parser.cpp @@ -289,17 +289,17 @@ std::vector<std::string> readExpectedEntries(const std::regex& regex, const mbgl } // namespace std::vector<std::string> readExpectedImageEntries(const mbgl::filesystem::path& base) { - static const std::regex regex(".*expected.*.png"); + static const std::regex regex(".*/expected.*.png"); return readExpectedEntries(regex, base); } std::vector<std::string> readExpectedMetricEntries(const mbgl::filesystem::path& base) { - static const std::regex regex(".*metrics.*.json"); + static const std::regex regex(".*/metrics.*.json"); return readExpectedEntries(regex, base); } std::vector<std::string> readExpectedJSONEntries(const mbgl::filesystem::path& base) { - static const std::regex regex(".*expected.*.json"); + static const std::regex regex(".*/expected.*.json"); return readExpectedEntries(regex, base); } |