diff --git a/metrics/BUILD.bazel b/metrics/BUILD.bazel index b0971ef69..6c2ad8e81 100644 --- a/metrics/BUILD.bazel +++ b/metrics/BUILD.bazel @@ -5,7 +5,6 @@ filegroup( "integration/**", "tests/**", "linux-gcc8-release/**", - "expectations/platform-all/**", "ignores/**", "ios-render-test-runner/**", # iOS only "expectations/platform-ios/**", # iOS only diff --git a/metrics/FIXME-linux-asan-style.json b/metrics/FIXME-linux-asan-style.json index d5e2f28dc..48c25a255 100644 --- a/metrics/FIXME-linux-asan-style.json +++ b/metrics/FIXME-linux-asan-style.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/android-render-test-runner-metrics.json b/metrics/android-render-test-runner-metrics.json index e0a995919..e15aa1ee8 100644 --- a/metrics/android-render-test-runner-metrics.json +++ b/metrics/android-render-test-runner-metrics.json @@ -2,7 +2,6 @@ "base_test_path": "tests", "cache_path": "cache-metrics.db", "expectation_paths": [ - "expectations/platform-all", "expectations/platform-android" ], "ignore_paths": [ diff --git a/metrics/android-render-test-runner-style.json b/metrics/android-render-test-runner-style.json index f79bfa464..dd2cf65d8 100644 --- a/metrics/android-render-test-runner-style.json +++ b/metrics/android-render-test-runner-style.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all", "expectations/platform-android" ], "ignore_paths": [ diff --git a/metrics/expectations/platform-all/render-tests/circle-sort-key/literal/expected.png b/metrics/expectations/platform-all/render-tests/circle-sort-key/literal/expected.png deleted file mode 100644 index 78c42d43f..000000000 Binary files a/metrics/expectations/platform-all/render-tests/circle-sort-key/literal/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/debug/collision-lines-overscaled/expected.png b/metrics/expectations/platform-all/render-tests/debug/collision-lines-overscaled/expected.png deleted file mode 100644 index 38eb0d2da..000000000 Binary files a/metrics/expectations/platform-all/render-tests/debug/collision-lines-overscaled/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/debug/collision-lines-pitched/expected.png b/metrics/expectations/platform-all/render-tests/debug/collision-lines-pitched/expected.png deleted file mode 100644 index 416d7d571..000000000 Binary files a/metrics/expectations/platform-all/render-tests/debug/collision-lines-pitched/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/debug/collision-lines/expected.png b/metrics/expectations/platform-all/render-tests/debug/collision-lines/expected.png deleted file mode 100644 index 3f4790a58..000000000 Binary files a/metrics/expectations/platform-all/render-tests/debug/collision-lines/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/debug/collision-pitched-wrapped/expected.png b/metrics/expectations/platform-all/render-tests/debug/collision-pitched-wrapped/expected.png deleted file mode 100644 index 9b718c09c..000000000 Binary files a/metrics/expectations/platform-all/render-tests/debug/collision-pitched-wrapped/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/map-mode/tile-avoid-edges/expected.png b/metrics/expectations/platform-all/render-tests/map-mode/tile-avoid-edges/expected.png deleted file mode 100644 index bf518065e..000000000 Binary files a/metrics/expectations/platform-all/render-tests/map-mode/tile-avoid-edges/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/symbol-visibility/visible/expected.png b/metrics/expectations/platform-all/render-tests/symbol-visibility/visible/expected.png deleted file mode 100644 index 8da157772..000000000 Binary files a/metrics/expectations/platform-all/render-tests/symbol-visibility/visible/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png b/metrics/expectations/platform-all/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png deleted file mode 100644 index cd690ca15..000000000 Binary files a/metrics/expectations/platform-all/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png b/metrics/expectations/platform-all/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png deleted file mode 100644 index cd690ca15..000000000 Binary files a/metrics/expectations/platform-all/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png b/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png deleted file mode 100644 index b996d264c..000000000 Binary files a/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png b/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png deleted file mode 100644 index 764d4a0b2..000000000 Binary files a/metrics/expectations/platform-all/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/text-pitch-scaling/line-half/expected.png b/metrics/expectations/platform-all/render-tests/text-pitch-scaling/line-half/expected.png deleted file mode 100644 index dbb104ee0..000000000 Binary files a/metrics/expectations/platform-all/render-tests/text-pitch-scaling/line-half/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png b/metrics/expectations/platform-all/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png deleted file mode 100644 index 9bc291b09..000000000 Binary files a/metrics/expectations/platform-all/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png b/metrics/expectations/platform-all/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png deleted file mode 100644 index 9a9941775..000000000 Binary files a/metrics/expectations/platform-all/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png b/metrics/expectations/platform-all/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png deleted file mode 100644 index 4e3d01284..000000000 Binary files a/metrics/expectations/platform-all/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png and /dev/null differ diff --git a/metrics/expectations/platform-all/render-tests/text-variable-anchor/rotated-offset/expected.png b/metrics/expectations/platform-all/render-tests/text-variable-anchor/rotated-offset/expected.png deleted file mode 100644 index 13690d147..000000000 Binary files a/metrics/expectations/platform-all/render-tests/text-variable-anchor/rotated-offset/expected.png and /dev/null differ diff --git a/metrics/integration/render-tests/circle-sort-key/literal/expected.png b/metrics/integration/render-tests/circle-sort-key/literal/expected.png index f9be1c32b..78c42d43f 100644 Binary files a/metrics/integration/render-tests/circle-sort-key/literal/expected.png and b/metrics/integration/render-tests/circle-sort-key/literal/expected.png differ diff --git a/metrics/integration/render-tests/debug/collision-lines-overscaled/expected.png b/metrics/integration/render-tests/debug/collision-lines-overscaled/expected.png index 4c68f473b..38eb0d2da 100644 Binary files a/metrics/integration/render-tests/debug/collision-lines-overscaled/expected.png and b/metrics/integration/render-tests/debug/collision-lines-overscaled/expected.png differ diff --git a/metrics/integration/render-tests/debug/collision-lines-pitched/expected.png b/metrics/integration/render-tests/debug/collision-lines-pitched/expected.png index bb2254df5..416d7d571 100644 Binary files a/metrics/integration/render-tests/debug/collision-lines-pitched/expected.png and b/metrics/integration/render-tests/debug/collision-lines-pitched/expected.png differ diff --git a/metrics/integration/render-tests/debug/collision-lines/expected.png b/metrics/integration/render-tests/debug/collision-lines/expected.png index a2476e20f..3f4790a58 100644 Binary files a/metrics/integration/render-tests/debug/collision-lines/expected.png and b/metrics/integration/render-tests/debug/collision-lines/expected.png differ diff --git a/metrics/integration/render-tests/debug/collision-pitched-wrapped/expected.png b/metrics/integration/render-tests/debug/collision-pitched-wrapped/expected.png index d23243aa8..9b718c09c 100644 Binary files a/metrics/integration/render-tests/debug/collision-pitched-wrapped/expected.png and b/metrics/integration/render-tests/debug/collision-pitched-wrapped/expected.png differ diff --git a/metrics/integration/render-tests/map-mode/tile-avoid-edges/expected.png b/metrics/integration/render-tests/map-mode/tile-avoid-edges/expected.png index 39d3ebcd4..bf518065e 100644 Binary files a/metrics/integration/render-tests/map-mode/tile-avoid-edges/expected.png and b/metrics/integration/render-tests/map-mode/tile-avoid-edges/expected.png differ diff --git a/metrics/integration/render-tests/symbol-visibility/visible/expected.png b/metrics/integration/render-tests/symbol-visibility/visible/expected.png index fcb921de3..8da157772 100644 Binary files a/metrics/integration/render-tests/symbol-visibility/visible/expected.png and b/metrics/integration/render-tests/symbol-visibility/visible/expected.png differ diff --git a/metrics/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png b/metrics/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png index 124e31a9b..cd690ca15 100644 Binary files a/metrics/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png and b/metrics/integration/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png differ diff --git a/metrics/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png b/metrics/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png index 124e31a9b..cd690ca15 100644 Binary files a/metrics/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png and b/metrics/integration/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png differ diff --git a/metrics/integration/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png b/metrics/integration/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png index f2b0fe840..b996d264c 100644 Binary files a/metrics/integration/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png and b/metrics/integration/render-tests/text-pitch-alignment/viewport-overzoomed/expected.png differ diff --git a/metrics/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png b/metrics/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png index 88dc99f3d..764d4a0b2 100644 Binary files a/metrics/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png and b/metrics/integration/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png differ diff --git a/metrics/integration/render-tests/text-pitch-scaling/line-half/expected.png b/metrics/integration/render-tests/text-pitch-scaling/line-half/expected.png index 9e7036076..dbb104ee0 100644 Binary files a/metrics/integration/render-tests/text-pitch-scaling/line-half/expected.png and b/metrics/integration/render-tests/text-pitch-scaling/line-half/expected.png differ diff --git a/metrics/integration/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png b/metrics/integration/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png index ef5e7864e..9bc291b09 100644 Binary files a/metrics/integration/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png and b/metrics/integration/render-tests/text-variable-anchor/all-anchors-tile-map-mode/expected.png differ diff --git a/metrics/integration/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png b/metrics/integration/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png index 2dad19da2..9a9941775 100644 Binary files a/metrics/integration/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png and b/metrics/integration/render-tests/text-variable-anchor/left-top-right-bottom-offset-tile-map-mode/expected.png differ diff --git a/metrics/integration/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png b/metrics/integration/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png index 56bcdfc2f..4e3d01284 100644 Binary files a/metrics/integration/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png and b/metrics/integration/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png differ diff --git a/metrics/integration/render-tests/text-variable-anchor/rotated-offset/expected.png b/metrics/integration/render-tests/text-variable-anchor/rotated-offset/expected.png index d056626fe..13690d147 100644 Binary files a/metrics/integration/render-tests/text-variable-anchor/rotated-offset/expected.png and b/metrics/integration/render-tests/text-variable-anchor/rotated-offset/expected.png differ diff --git a/metrics/ios-render-test-runner-metrics.json b/metrics/ios-render-test-runner-metrics.json index fc0ee5332..8a073b875 100644 --- a/metrics/ios-render-test-runner-metrics.json +++ b/metrics/ios-render-test-runner-metrics.json @@ -2,7 +2,6 @@ "base_test_path": "tests", "cache_path": "cache-metrics.db", "expectation_paths": [ - "expectations/platform-all", "expectations/platform-ios" ], "ignore_paths": [ diff --git a/metrics/ios-render-test-runner-style.json b/metrics/ios-render-test-runner-style.json index 432edb11a..e5d9de77b 100644 --- a/metrics/ios-render-test-runner-style.json +++ b/metrics/ios-render-test-runner-style.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all", "expectations/platform-ios" ], "ignore_paths": [ diff --git a/metrics/linux-clang8-release-metrics.json b/metrics/linux-clang8-release-metrics.json index fd1c20d9c..6d3d88c38 100644 --- a/metrics/linux-clang8-release-metrics.json +++ b/metrics/linux-clang8-release-metrics.json @@ -2,7 +2,6 @@ "base_test_path": "tests", "cache_path": "cache-metrics.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/linux-clang8-release-style.json b/metrics/linux-clang8-release-style.json index d67e62e67..1c18a070c 100644 --- a/metrics/linux-clang8-release-style.json +++ b/metrics/linux-clang8-release-style.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/linux-drawable.json b/metrics/linux-drawable.json index 9359406dd..b66fc75f5 100644 --- a/metrics/linux-drawable.json +++ b/metrics/linux-drawable.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/linux-gcc8-debug-coverage-style.json b/metrics/linux-gcc8-debug-coverage-style.json index d5e2f28dc..48c25a255 100644 --- a/metrics/linux-gcc8-debug-coverage-style.json +++ b/metrics/linux-gcc8-debug-coverage-style.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/linux-gcc8-release-metrics.json b/metrics/linux-gcc8-release-metrics.json index b39d51949..08ee8da33 100644 --- a/metrics/linux-gcc8-release-metrics.json +++ b/metrics/linux-gcc8-release-metrics.json @@ -2,7 +2,6 @@ "base_test_path": "tests", "cache_path": "cache-metrics.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/linux-gcc8-release-style.json b/metrics/linux-gcc8-release-style.json index 8869ee8a4..7486072ca 100644 --- a/metrics/linux-gcc8-release-style.json +++ b/metrics/linux-gcc8-release-style.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/linux-legacy.json b/metrics/linux-legacy.json index e50a58969..74add27aa 100644 --- a/metrics/linux-legacy.json +++ b/metrics/linux-legacy.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/linux-tsan-style.json b/metrics/linux-tsan-style.json index d5e2f28dc..48c25a255 100644 --- a/metrics/linux-tsan-style.json +++ b/metrics/linux-tsan-style.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/linux-ubsan-style.json b/metrics/linux-ubsan-style.json index d5e2f28dc..48c25a255 100644 --- a/metrics/linux-ubsan-style.json +++ b/metrics/linux-ubsan-style.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/macos-xcode11-debug-style.json b/metrics/macos-xcode11-debug-style.json index a531fcf3d..f641a661a 100644 --- a/metrics/macos-xcode11-debug-style.json +++ b/metrics/macos-xcode11-debug-style.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/macos-xcode11-release-metrics.json b/metrics/macos-xcode11-release-metrics.json index de61c0746..2ca766cba 100644 --- a/metrics/macos-xcode11-release-metrics.json +++ b/metrics/macos-xcode11-release-metrics.json @@ -2,7 +2,6 @@ "base_test_path": "tests", "cache_path": "cache-metrics.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json", diff --git a/metrics/macos-xcode11-release-style.json b/metrics/macos-xcode11-release-style.json index dc8916ae2..2e202e03f 100644 --- a/metrics/macos-xcode11-release-style.json +++ b/metrics/macos-xcode11-release-style.json @@ -2,7 +2,6 @@ "base_test_path": "integration", "cache_path": "cache-style.db", "expectation_paths": [ - "expectations/platform-all" ], "ignore_paths": [ "ignores/platform-all.json",