diff options
| author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-12-05 17:26:03 +0200 |
|---|---|---|
| committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-12-09 17:53:34 +0200 |
| commit | 3d0001642ba2d6290252f05592d54fd928f56b63 (patch) | |
| tree | a1fbdbb54f788ea7a038fba4d17b50c2d66bd4d6 /render-test/runner.cpp | |
| parent | 7eee124677983a01bbbddaa8005b399c277df5dd (diff) | |
| download | qtlocation-mapboxgl-3d0001642ba2d6290252f05592d54fd928f56b63.tar.gz | |
[test-runner] Simplify update option and remove obsolete ifdefs
Diffstat (limited to 'render-test/runner.cpp')
| -rw-r--r-- | render-test/runner.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/render-test/runner.cpp b/render-test/runner.cpp index 67cc3aea0d..953576cf78 100644 --- a/render-test/runner.cpp +++ b/render-test/runner.cpp @@ -186,7 +186,6 @@ bool TestRunner::checkQueryTestResults(mbgl::PremultipliedImage&& actualImage, return false; } -#if !TEST_READ_ONLY if (updateResults == UpdateResults::PLATFORM) { mbgl::filesystem::create_directories(expectations.back()); mbgl::util::write_file(expectations.back().string() + "/expected.json", metadata.actualJson); @@ -197,7 +196,6 @@ bool TestRunner::checkQueryTestResults(mbgl::PremultipliedImage&& actualImage, } mbgl::util::write_file(base + "/actual.json", metadata.actualJson); -#endif std::vector<std::string> expectedJsonPaths; mbgl::filesystem::path expectedMetricsPath; @@ -256,7 +254,6 @@ bool TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, return false; } -#if !TEST_READ_ONLY if (updateResults == UpdateResults::PLATFORM) { mbgl::filesystem::create_directories(expectations.back()); mbgl::util::write_file(expectations.back().string() + "/expected.png", mbgl::encodePNG(actualImage)); @@ -267,7 +264,6 @@ bool TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, } mbgl::util::write_file(base + "/actual.png", metadata.actual); -#endif mbgl::PremultipliedImage expectedImage{actualImage.size}; mbgl::PremultipliedImage imageDiff{actualImage.size}; @@ -307,9 +303,7 @@ bool TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, metadata.diff = mbgl::encodePNG(imageDiff); -#if !TEST_READ_ONLY mbgl::util::write_file(base + "/diff.png", metadata.diff); -#endif metadata.difference = pixels / expectedImage.size.area(); if (metadata.difference <= metadata.allowed) { @@ -323,13 +317,11 @@ bool TestRunner::checkRenderTestResults(mbgl::PremultipliedImage&& actualImage, bool TestRunner::checkProbingResults(TestMetadata& metadata) { if (metadata.metrics.isEmpty()) return true; const std::vector<mbgl::filesystem::path>& expectedMetrics = metadata.paths.expectedMetrics; -#if !TEST_READ_ONLY if (updateResults == UpdateResults::METRICS) { mbgl::filesystem::create_directories(expectedMetrics.back()); mbgl::util::write_file(expectedMetrics.back().string() + "/metrics.json", serializeMetrics(metadata.metrics)); return true; } -#endif // Check the possible paths in reverse order, so that the default path with the test style will only be checked in // the very end. |