From 66d1e2ac90415c54b85f58a18d59823b70f04105 Mon Sep 17 00:00:00 2001
From: Alex Cristici <alex.cristici@gmail.com>
Date: Wed, 30 Apr 2025 21:26:44 +0300
Subject: [PATCH] Update render tests on Linux (#3441)

---
 metrics/BUILD.bazel                               |  1 +
 metrics/ignores/linux-drawable.json               |  3 ---
 ...nux-vulkan.json => platform-linux-vulkan.json} |  0
 metrics/linux-drawable.json                       |  3 +--
 metrics/linux-legacy.json                         | 15 ---------------
 metrics/linux-vulkan.json                         |  3 +--
 render-test/BUILD.bazel                           |  2 +-
 7 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 metrics/ignores/linux-drawable.json
 rename metrics/ignores/{linux-vulkan.json => platform-linux-vulkan.json} (100%)
 delete mode 100644 metrics/linux-legacy.json

diff --git a/metrics/BUILD.bazel b/metrics/BUILD.bazel
index 97def557b..f6d01f6e2 100644
--- a/metrics/BUILD.bazel
+++ b/metrics/BUILD.bazel
@@ -21,6 +21,7 @@ filegroup(
         "ios-render-test-runner-style.json",  # iOS only
         "linux-gcc8-release-metrics.json",
         "linux-gcc8-release-style.json",
+        "linux-drawable.json",
     ],
     visibility = [
         "//platform/ios/test/common:__pkg__",
diff --git a/metrics/ignores/linux-drawable.json b/metrics/ignores/linux-drawable.json
deleted file mode 100644
index d5afd0d8e..000000000
--- a/metrics/ignores/linux-drawable.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "render-tests/regressions/mapbox-gl-js#3426": "https://github.com/maplibre/maplibre-native/issues/1734"
-}
diff --git a/metrics/ignores/linux-vulkan.json b/metrics/ignores/platform-linux-vulkan.json
similarity index 100%
rename from metrics/ignores/linux-vulkan.json
rename to metrics/ignores/platform-linux-vulkan.json
diff --git a/metrics/linux-drawable.json b/metrics/linux-drawable.json
index b66fc75f5..2eb85a802 100644
--- a/metrics/linux-drawable.json
+++ b/metrics/linux-drawable.json
@@ -5,8 +5,7 @@
   ],
   "ignore_paths": [
       "ignores/platform-all.json",
-      "ignores/platform-linux.json",
-      "ignores/linux-drawable.json"
+      "ignores/platform-linux.json"
   ],
   "metric_path": "linux-gcc8-release",
   "probes": [
diff --git a/metrics/linux-legacy.json b/metrics/linux-legacy.json
deleted file mode 100644
index 74add27aa..000000000
--- a/metrics/linux-legacy.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "base_test_path": "integration",
-  "cache_path": "cache-style.db",
-  "expectation_paths": [
-  ],
-  "ignore_paths": [
-      "ignores/platform-all.json",
-      "ignores/platform-linux.json"
-  ],
-  "metric_path": "linux-gcc8-release",
-  "probes": [
-      "probeGFX",
-      "probeNetwork"
-  ]
-}
diff --git a/metrics/linux-vulkan.json b/metrics/linux-vulkan.json
index 915a3e65f..fe72271f5 100644
--- a/metrics/linux-vulkan.json
+++ b/metrics/linux-vulkan.json
@@ -6,8 +6,7 @@
   "ignore_paths": [
       "ignores/platform-all.json",
       "ignores/platform-linux.json",
-      "ignores/linux-drawable.json",
-      "ignores/linux-vulkan.json"
+      "ignores/platform-linux-vulkan.json"
   ],
   "metric_path": "linux-gcc8-release",
   "probes": [
diff --git a/render-test/BUILD.bazel b/render-test/BUILD.bazel
index 7b01925a8..d1ead91e0 100644
--- a/render-test/BUILD.bazel
+++ b/render-test/BUILD.bazel
@@ -45,7 +45,7 @@ cc_test(
     timeout = "long",
     args = [
         "--manifestPath",
-        "metrics/linux-gcc8-release-style.json",
+        "metrics/linux-drawable.json",
     ],
     data = [
         "//metrics:render-test-files",