[metrics] Use the cache database instead of file paths for fixtures

Now that we use a cache, we no longer need "asset_path" and
"vendor_path".

16 files changed, 27 insertions, 48 deletions

diff --git a/metrics/cache-metrics.db b/metrics/cache-metrics.db
new file mode 100644
index 0000000000..b52622fb7f
--- /dev/null
+++ b/metrics/cache-metrics.db
diff --git a/metrics/cache-style.db b/metrics/cache-style.db
new file mode 100644
index 0000000000..01a02c9360
--- /dev/null
+++ b/metrics/cache-style.db
diff --git a/metrics/next-FIXME-linux-asan-style.json b/metrics/next-FIXME-linux-asan-style.json
index 518337de9e..7c99b2784c 100644
--- a/metrics/next-FIXME-linux-asan-style.json
+++ b/metrics/next-FIXME-linux-asan-style.json
@@ -1,12 +1,11 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "../mapbox-gl-js/test/integration",
+    "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
     "ignore_paths": [
         "ignores/platform-all.json",
         "ignores/platform-linux.json"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/metrics/next-FIXME-linux-ubsan-style.json b/metrics/next-FIXME-linux-ubsan-style.json
index 518337de9e..7c99b2784c 100644
--- a/metrics/next-FIXME-linux-ubsan-style.json
+++ b/metrics/next-FIXME-linux-ubsan-style.json
@@ -1,12 +1,11 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "../mapbox-gl-js/test/integration",
+    "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
     "ignore_paths": [
         "ignores/platform-all.json",
         "ignores/platform-linux.json"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/metrics/next-android-render-test-runner-metrics.json b/metrics/next-android-render-test-runner-metrics.json
index f60e6a50f2..415c786b00 100644
--- a/metrics/next-android-render-test-runner-metrics.json
+++ b/metrics/next-android-render-test-runner-metrics.json
@@ -1,5 +1,6 @@
 {
     "base_test_path": "tests",
+    "cache_path": "cache-metrics.db",
     "expectation_paths": [
         "expectations/platform-all",
         "expectations/platform-android"
diff --git a/metrics/next-android-render-test-runner-style.json b/metrics/next-android-render-test-runner-style.json
index b00e9f0ea1..fb774b97dc 100644
--- a/metrics/next-android-render-test-runner-style.json
+++ b/metrics/next-android-render-test-runner-style.json
@@ -1,6 +1,6 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "../mapbox-gl-js/test/integration",
+    "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all",
         "expectations/platform-android"
@@ -15,6 +15,5 @@
         "probeGFX",
         "probeNetwork"
     ],
-    "result_path": "/sdcard",
-    "vendor_path": "../vendor"
+    "result_path": "/sdcard"
 }
diff --git a/metrics/next-linux-clang8-release-metrics.json b/metrics/next-linux-clang8-release-metrics.json
index 2afb821d5e..69793b589c 100644
--- a/metrics/next-linux-clang8-release-metrics.json
+++ b/metrics/next-linux-clang8-release-metrics.json
@@ -1,6 +1,6 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "tests",
+    "cache_path": "cache-metrics.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
@@ -13,6 +13,5 @@
         "probeGFX",
         "probeMemory",
         "probeNetwork"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/metrics/next-linux-clang8-release-style.json b/metrics/next-linux-clang8-release-style.json
index 137ad5ae24..a839a9e15d 100644
--- a/metrics/next-linux-clang8-release-style.json
+++ b/metrics/next-linux-clang8-release-style.json
@@ -1,6 +1,6 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "../mapbox-gl-js/test/integration",
+    "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
@@ -12,6 +12,5 @@
     "probes": [
         "probeGFX",
         "probeNetwork"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/metrics/next-linux-gcc8-debug-coverage-style.json b/metrics/next-linux-gcc8-debug-coverage-style.json
index 518337de9e..7c99b2784c 100644
--- a/metrics/next-linux-gcc8-debug-coverage-style.json
+++ b/metrics/next-linux-gcc8-debug-coverage-style.json
@@ -1,12 +1,11 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "../mapbox-gl-js/test/integration",
+    "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
     "ignore_paths": [
         "ignores/platform-all.json",
         "ignores/platform-linux.json"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/metrics/next-linux-gcc8-release-metrics.json b/metrics/next-linux-gcc8-release-metrics.json
index 6c041af80e..0f6a52d45f 100644
--- a/metrics/next-linux-gcc8-release-metrics.json
+++ b/metrics/next-linux-gcc8-release-metrics.json
@@ -1,6 +1,6 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "tests",
+    "cache_path": "cache-metrics.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
@@ -13,6 +13,5 @@
         "probeGFX",
         "probeMemory",
         "probeNetwork"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/metrics/next-linux-gcc8-release-style.json b/metrics/next-linux-gcc8-release-style.json
index 4961756a61..8f7093aaaa 100644
--- a/metrics/next-linux-gcc8-release-style.json
+++ b/metrics/next-linux-gcc8-release-style.json
@@ -1,6 +1,6 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "../mapbox-gl-js/test/integration",
+    "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
@@ -12,6 +12,5 @@
     "probes": [
         "probeGFX",
         "probeNetwork"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/metrics/next-linux-tsan-style.json b/metrics/next-linux-tsan-style.json
index 518337de9e..7c99b2784c 100644
--- a/metrics/next-linux-tsan-style.json
+++ b/metrics/next-linux-tsan-style.json
@@ -1,12 +1,11 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "../mapbox-gl-js/test/integration",
+    "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
     "ignore_paths": [
         "ignores/platform-all.json",
         "ignores/platform-linux.json"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/metrics/next-macos-xcode11-debug-style.json b/metrics/next-macos-xcode11-debug-style.json
index 463e771a1e..083f78450e 100644
--- a/metrics/next-macos-xcode11-debug-style.json
+++ b/metrics/next-macos-xcode11-debug-style.json
@@ -1,12 +1,11 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "../mapbox-gl-js/test/integration",
+    "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
     "ignore_paths": [
         "ignores/platform-all.json",
         "ignores/platform-macos.json"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/metrics/next-macos-xcode11-release-metrics.json b/metrics/next-macos-xcode11-release-metrics.json
index dc387af251..41e517bdc8 100644
--- a/metrics/next-macos-xcode11-release-metrics.json
+++ b/metrics/next-macos-xcode11-release-metrics.json
@@ -1,6 +1,6 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "tests",
+    "cache_path": "cache-metrics.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
@@ -13,6 +13,5 @@
         "probeGFX",
         "probeMemory",
         "probeNetwork"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/metrics/next-macos-xcode11-release-style.json b/metrics/next-macos-xcode11-release-style.json
index c04f290fae..326fc645f2 100644
--- a/metrics/next-macos-xcode11-release-style.json
+++ b/metrics/next-macos-xcode11-release-style.json
@@ -1,6 +1,6 @@
 {
-    "asset_path": "../mapbox-gl-js/test/integration",
     "base_test_path": "../mapbox-gl-js/test/integration",
+    "cache_path": "cache-style.db",
     "expectation_paths": [
         "expectations/platform-all"
     ],
@@ -12,6 +12,5 @@
     "probes": [
         "probeGFX",
         "probeNetwork"
-    ],
-    "vendor_path": "../vendor"
+    ]
 }
diff --git a/render-test/android/app/src/main/assets/to_zip.txt b/render-test/android/app/src/main/assets/to_zip.txt
index 13f3567233..3f1dce02a5 100644
--- a/render-test/android/app/src/main/assets/to_zip.txt
+++ b/render-test/android/app/src/main/assets/to_zip.txt
@@ -1,20 +1,10 @@
-mapbox-gl-js/test/integration/data/
-mapbox-gl-js/test/integration/video/
-mapbox-gl-js/test/integration/tilesets/
-mapbox-gl-js/test/integration/tiles/
-mapbox-gl-js/test/integration/styles/
 mapbox-gl-js/test/integration/render-tests/
 mapbox-gl-js/test/integration/query-tests/
-mapbox-gl-js/test/integration/image/
-mapbox-gl-js/test/integration/glyphs/
-mapbox-gl-js/test/integration/geojson/
-mapbox-gl-js/test/integration/sprites/
-vendor/mapbox-gl-styles/styles/
-vendor/mapbox-gl-styles/sprites/
-vendor/mvt-fixtures/real-world/
 metrics/expectations/
 metrics/ignores/
 metrics/tests/
 metrics/next-android-render-test-runner/
 metrics/next-android-render-test-runner-metrics.json
 metrics/next-android-render-test-runner-style.json
+metrics/cache-metrics.db
+metrics/cache-style.db