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/runner.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/runner.cpp')
-rw-r--r-- | render-test/runner.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/render-test/runner.cpp b/render-test/runner.cpp index 4d4b586a17..5df167431f 100644 --- a/render-test/runner.cpp +++ b/render-test/runner.cpp @@ -122,7 +122,7 @@ bool TestRunner::checkQueryTestResults(mbgl::PremultipliedImage&& actualImage, mbgl::filesystem::path expectedMetricsPath; for (auto rit = expectations.rbegin(); rit != expectations.rend(); ++rit) { if (mbgl::filesystem::exists(*rit)) { - expectedJsonPaths = readExpectedEntries(*rit); + expectedJsonPaths = readExpectedJSONEntries(*rit); if (!expectedJsonPaths.empty()) break; } } @@ -206,7 +206,7 @@ bool TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, maybeExpectedMetricsPath.replace_filename("metrics.json"); metadata.expectedMetrics = readExpectedMetrics(maybeExpectedMetricsPath); } - expectedImagesPaths = readExpectedEntries(*rit); + expectedImagesPaths = readExpectedImageEntries(*rit); if (!expectedImagesPaths.empty()) break; } } |