diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-10-11 16:31:15 +0300 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2019-10-11 18:29:52 +0300 |
commit | 7f5c63061398e294e1bd79e157e5486ee787c726 (patch) | |
tree | 41e92fdadeb1d446eb6ca1573f146d12d4bc6c14 /render-test/runner.cpp | |
parent | 0752e26055ff7d1d0fc8ceb11cd0b72775925a9e (diff) | |
download | qtlocation-mapboxgl-7f5c63061398e294e1bd79e157e5486ee787c726.tar.gz |
[render-test] Fix UPDATE_METRICS=1 changing the path of file size tests
Should use the exact same path as described on style.json
Diffstat (limited to 'render-test/runner.cpp')
-rw-r--r-- | render-test/runner.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/render-test/runner.cpp b/render-test/runner.cpp index f056902b7f..103a14a079 100644 --- a/render-test/runner.cpp +++ b/render-test/runner.cpp @@ -579,20 +579,22 @@ bool TestRunner::runOperations(const std::string& key, TestMetadata& metadata) { assert(operationArray[2].IsString()); std::string mark = std::string(operationArray[1].GetString(), operationArray[1].GetStringLength()); - mbgl::filesystem::path path = std::string(operationArray[2].GetString(), operationArray[2].GetStringLength()); + std::string path = std::string(operationArray[2].GetString(), operationArray[2].GetStringLength()); assert(!path.empty()); - if (!path.is_absolute()) { - path = metadata.paths.defaultExpectations() / path; + mbgl::filesystem::path filePath(path); + + if (!filePath.is_absolute()) { + filePath = metadata.paths.defaultExpectations() / filePath; } - if (mbgl::filesystem::exists(path)) { - auto size = mbgl::filesystem::file_size(path); + if (mbgl::filesystem::exists(filePath)) { + auto size = mbgl::filesystem::file_size(filePath); metadata.metrics.fileSize.emplace(std::piecewise_construct, std::forward_as_tuple(std::move(mark)), std::forward_as_tuple(std::move(path), size)); } else { - metadata.errorMessage = std::string("File not found: ") + path.string(); + metadata.errorMessage = std::string("File not found: ") + path; return false; } } else if (operationArray[0].GetString() == memoryProbeStartOp) { |