[render-test] Fix UPDATE_METRICS=1 changing the path of file size tests

Should use the exact same path as described on style.json

4 files changed, 11 insertions, 9 deletions

diff --git a/render-test/runner.cpp b/render-test/runner.cpp
index f056902b7..103a14a07 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) {
diff --git a/render-test/tests/filesize/fail-size-is-over/metrics.json b/render-test/tests/filesize/fail-size-is-over/metrics.json
index 2df7e7da1..4aa4fe131 100644
--- a/render-test/tests/filesize/fail-size-is-over/metrics.json
+++ b/render-test/tests/filesize/fail-size-is-over/metrics.json
@@ -1 +1 @@
-{"fileSize":[["image","../render-test/tests/filesize/fail-size-is-over/expected.png",100],["style","../render-test/tests/filesize/fail-size-is-over/style.json",100]]}
+{"fileSize":[["image","expected.png",999],["style","style.json",999]]}
diff --git a/render-test/tests/filesize/fail-size-is-under/metrics.json b/render-test/tests/filesize/fail-size-is-under/metrics.json
index 92d3f1e3d..cd657a4cc 100644
--- a/render-test/tests/filesize/fail-size-is-under/metrics.json
+++ b/render-test/tests/filesize/fail-size-is-under/metrics.json
@@ -1 +1 @@
-{"fileSize":[["image","../render-test/tests/filesize/fail-size-is-under/expected.png",999],["style","../render-test/tests/filesize/fail-size-is-under/style.json",999]]}
+{"fileSize":[["image","expected.png",100],["style","style.json",100]]}
diff --git a/render-test/tests/filesize/pass-size-is-same/metrics.json b/render-test/tests/filesize/pass-size-is-same/metrics.json
index 4c01d3b2c..607565213 100644
--- a/render-test/tests/filesize/pass-size-is-same/metrics.json
+++ b/render-test/tests/filesize/pass-size-is-same/metrics.json
@@ -1 +1 @@
-{"fileSize":[["image","../render-test/tests/filesize/pass-size-is-same/expected.png",686],["style","../render-test/tests/filesize/pass-size-is-same/style.json",609]]}
\ No newline at end of file
+{"fileSize":[["image","expected.png",686],["style","style.json",609]]}
\ No newline at end of file