From 970cabe0eb441270ca3af44e495a5fee997ab54c Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Tue, 10 Dec 2019 17:10:48 +0200 Subject: [build] Reorganize the render tests Move everything that might collect metrics to the metrics/ directory, the only test manifests inside the render-test/ directory are the unit tests of the probes. --- render-test/android/app/src/main/assets/to_zip.txt | 9 +-- .../expected.png | Bin 429 -> 0 bytes .../regressions/mapbox-gl-js#2305/expected.png | Bin 52155 -> 0 bytes .../regressions/mapbox-gl-js#5978/expected.png | Bin 731 -> 0 bytes .../sprites/1x-screen-1x-pattern/expected.png | Bin 1600 -> 0 bytes .../sprites/1x-screen-2x-pattern/expected.png | Bin 1274 -> 0 bytes .../sprites/2x-screen-1x-pattern/expected.png | Bin 6342 -> 0 bytes .../sprites/2x-screen-2x-pattern/expected.png | Bin 4339 -> 0 bytes .../debug/collision-lines-overscaled/expected.png | Bin 7774 -> 0 bytes .../debug/collision-lines-pitched/expected.png | Bin 165500 -> 0 bytes .../debug/collision-lines/expected.png | Bin 196454 -> 0 bytes .../debug/collision-pitched-wrapped/expected.png | Bin 69725 -> 0 bytes .../symbol-visibility/visible/expected.png | Bin 14729 -> 0 bytes .../auto-text-rotation-alignment-map/expected.png | Bin 26157 -> 0 bytes .../map-text-rotation-alignment-map/expected.png | Bin 26157 -> 0 bytes .../expected.png | Bin 26866 -> 0 bytes .../pitched-rotated-debug/expected.png | Bin 43135 -> 0 bytes .../rotated-offset/expected.png | Bin 35553 -> 0 bytes .../memory/pass-memory-size-is-same/expected.png | Bin 96 -> 0 bytes render-test/ignores/android-temp-fail.json | 9 --- render-test/ignores/linux-ignores.json | 11 ---- render-test/linux-manifest.json | 7 --- render-test/linux-probe-manifest.json | 7 --- render-test/linux-query-manifest.json | 6 -- render-test/mac-ignores.json | 5 -- render-test/mac-manifest.json | 7 --- render-test/mac-probe-manifest.json | 8 --- .../memory/pass-memory-size-is-same/metrics.json | 19 ------ .../file-size/fail-file-doesnt-match/expected.png | Bin 169 -> 0 bytes .../file-size/fail-file-doesnt-match/metrics.json | 14 ----- .../file-size/fail-file-doesnt-match/style.json | 32 ---------- .../file-size/fail-file-not-found/expected.png | Bin 169 -> 0 bytes .../tests/file-size/fail-file-not-found/style.json | 32 ---------- .../tests/file-size/fail-size-is-over/expected.png | Bin 169 -> 0 bytes .../tests/file-size/fail-size-is-over/metrics.json | 14 ----- .../tests/file-size/fail-size-is-over/style.json | 32 ---------- .../file-size/fail-size-is-under/expected.png | Bin 169 -> 0 bytes .../file-size/fail-size-is-under/metrics.json | 14 ----- .../tests/file-size/fail-size-is-under/style.json | 32 ---------- .../pass-size-is-in-tolerance-higher/expected.png | Bin 169 -> 0 bytes .../pass-size-is-in-tolerance-higher/metrics.json | 14 ----- .../pass-size-is-in-tolerance-higher/style.json | 32 ---------- .../pass-size-is-in-tolerance-lower/expected.png | Bin 169 -> 0 bytes .../pass-size-is-in-tolerance-lower/metrics.json | 14 ----- .../pass-size-is-in-tolerance-lower/style.json | 32 ---------- .../tests/file-size/pass-size-is-same/expected.png | Bin 169 -> 0 bytes .../tests/file-size/pass-size-is-same/metrics.json | 24 -------- .../tests/file-size/pass-size-is-same/style.json | 34 ----------- .../tests/gfx/fail-ib-mem-mismatch/expected.png | Bin 46431 -> 0 bytes .../tests/gfx/fail-ib-mem-mismatch/metrics.json | 5 -- .../tests/gfx/fail-ib-mem-mismatch/style.json | 20 ------ .../fail-negative-framebuffer-count/expected.png | Bin 46431 -> 0 bytes .../fail-negative-framebuffer-count/metrics.json | 5 -- .../gfx/fail-negative-framebuffer-count/style.json | 20 ------ .../gfx/fail-texture-mem-mismatch/expected.png | Bin 46431 -> 0 bytes .../gfx/fail-texture-mem-mismatch/metrics.json | 5 -- .../tests/gfx/fail-texture-mem-mismatch/style.json | 20 ------ .../tests/gfx/fail-too-few-buffers/expected.png | Bin 46431 -> 0 bytes .../tests/gfx/fail-too-few-buffers/metrics.json | 5 -- .../tests/gfx/fail-too-few-buffers/style.json | 20 ------ .../tests/gfx/fail-too-few-textures/expected.png | Bin 46431 -> 0 bytes .../tests/gfx/fail-too-few-textures/metrics.json | 5 -- .../tests/gfx/fail-too-few-textures/style.json | 20 ------ .../tests/gfx/fail-too-many-drawcalls/expected.png | Bin 46431 -> 0 bytes .../tests/gfx/fail-too-many-drawcalls/metrics.json | 5 -- .../tests/gfx/fail-too-many-drawcalls/style.json | 20 ------ .../tests/gfx/fail-vb-mem-mismatch/expected.png | Bin 46431 -> 0 bytes .../tests/gfx/fail-vb-mem-mismatch/metrics.json | 5 -- .../tests/gfx/fail-vb-mem-mismatch/style.json | 20 ------ .../tests/gfx/pass-double-probe/expected.png | Bin 42373 -> 0 bytes .../tests/gfx/pass-double-probe/metrics.json | 6 -- render-test/tests/gfx/pass-double-probe/style.json | 22 ------- .../tests/gfx/pass-probe-reset/expected.png | Bin 42373 -> 0 bytes .../tests/gfx/pass-probe-reset/metrics.json | 6 -- render-test/tests/gfx/pass-probe-reset/style.json | 24 -------- render-test/tests/gfx/pass/expected.png | Bin 46431 -> 0 bytes render-test/tests/gfx/pass/metrics.json | 5 -- render-test/tests/gfx/pass/style.json | 20 ------ .../fail-memory-size-is-too-big/expected.png | Bin 96 -> 0 bytes .../fail-memory-size-is-too-big/metrics.json | 19 ------ .../memory/fail-memory-size-is-too-big/style.json | 52 ---------------- .../fail-memory-size-is-too-small/expected.png | Bin 96 -> 0 bytes .../fail-memory-size-is-too-small/metrics.json | 19 ------ .../fail-memory-size-is-too-small/style.json | 52 ---------------- .../memory/pass-memory-size-is-same/expected.png | Bin 96 -> 0 bytes .../memory/pass-memory-size-is-same/metrics.json | 19 ------ .../memory/pass-memory-size-is-same/style.json | 52 ---------------- .../network/fail-requests-transferred/expected.png | Bin 17383 -> 0 bytes .../network/fail-requests-transferred/metrics.json | 14 ----- .../network/fail-requests-transferred/style.json | 67 --------------------- .../tests/network/fail-requests/expected.png | Bin 17383 -> 0 bytes .../tests/network/fail-requests/metrics.json | 14 ----- render-test/tests/network/fail-requests/style.json | 67 --------------------- .../tests/network/fail-transferred/expected.png | Bin 17383 -> 0 bytes .../tests/network/fail-transferred/metrics.json | 14 ----- .../tests/network/fail-transferred/style.json | 67 --------------------- render-test/tests/network/pass/expected.png | Bin 17383 -> 0 bytes render-test/tests/network/pass/metrics.json | 14 ----- render-test/tests/network/pass/style.json | 67 --------------------- render-test/tests/should-fail.json | 18 ------ 100 files changed, 5 insertions(+), 1216 deletions(-) delete mode 100644 render-test/expected/android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png delete mode 100644 render-test/expected/android/render-tests/regressions/mapbox-gl-js#2305/expected.png delete mode 100644 render-test/expected/android/render-tests/regressions/mapbox-gl-js#5978/expected.png delete mode 100644 render-test/expected/android/render-tests/sprites/1x-screen-1x-pattern/expected.png delete mode 100644 render-test/expected/android/render-tests/sprites/1x-screen-2x-pattern/expected.png delete mode 100644 render-test/expected/android/render-tests/sprites/2x-screen-1x-pattern/expected.png delete mode 100644 render-test/expected/android/render-tests/sprites/2x-screen-2x-pattern/expected.png delete mode 100644 render-test/expected/render-tests/debug/collision-lines-overscaled/expected.png delete mode 100644 render-test/expected/render-tests/debug/collision-lines-pitched/expected.png delete mode 100644 render-test/expected/render-tests/debug/collision-lines/expected.png delete mode 100644 render-test/expected/render-tests/debug/collision-pitched-wrapped/expected.png delete mode 100644 render-test/expected/render-tests/symbol-visibility/visible/expected.png delete mode 100644 render-test/expected/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png delete mode 100644 render-test/expected/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png delete mode 100644 render-test/expected/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png delete mode 100644 render-test/expected/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png delete mode 100644 render-test/expected/render-tests/text-variable-anchor/rotated-offset/expected.png delete mode 100644 render-test/expected/tests/memory/pass-memory-size-is-same/expected.png delete mode 100644 render-test/ignores/android-temp-fail.json delete mode 100644 render-test/ignores/linux-ignores.json delete mode 100644 render-test/linux-manifest.json delete mode 100644 render-test/linux-probe-manifest.json delete mode 100644 render-test/linux-query-manifest.json delete mode 100644 render-test/mac-ignores.json delete mode 100644 render-test/mac-manifest.json delete mode 100644 render-test/mac-probe-manifest.json delete mode 100644 render-test/metrics/mac/tests/memory/pass-memory-size-is-same/metrics.json delete mode 100644 render-test/tests/file-size/fail-file-doesnt-match/expected.png delete mode 100644 render-test/tests/file-size/fail-file-doesnt-match/metrics.json delete mode 100644 render-test/tests/file-size/fail-file-doesnt-match/style.json delete mode 100644 render-test/tests/file-size/fail-file-not-found/expected.png delete mode 100644 render-test/tests/file-size/fail-file-not-found/style.json delete mode 100644 render-test/tests/file-size/fail-size-is-over/expected.png delete mode 100644 render-test/tests/file-size/fail-size-is-over/metrics.json delete mode 100644 render-test/tests/file-size/fail-size-is-over/style.json delete mode 100644 render-test/tests/file-size/fail-size-is-under/expected.png delete mode 100644 render-test/tests/file-size/fail-size-is-under/metrics.json delete mode 100644 render-test/tests/file-size/fail-size-is-under/style.json delete mode 100644 render-test/tests/file-size/pass-size-is-in-tolerance-higher/expected.png delete mode 100644 render-test/tests/file-size/pass-size-is-in-tolerance-higher/metrics.json delete mode 100644 render-test/tests/file-size/pass-size-is-in-tolerance-higher/style.json delete mode 100644 render-test/tests/file-size/pass-size-is-in-tolerance-lower/expected.png delete mode 100644 render-test/tests/file-size/pass-size-is-in-tolerance-lower/metrics.json delete mode 100644 render-test/tests/file-size/pass-size-is-in-tolerance-lower/style.json delete mode 100644 render-test/tests/file-size/pass-size-is-same/expected.png delete mode 100644 render-test/tests/file-size/pass-size-is-same/metrics.json delete mode 100644 render-test/tests/file-size/pass-size-is-same/style.json delete mode 100644 render-test/tests/gfx/fail-ib-mem-mismatch/expected.png delete mode 100644 render-test/tests/gfx/fail-ib-mem-mismatch/metrics.json delete mode 100644 render-test/tests/gfx/fail-ib-mem-mismatch/style.json delete mode 100644 render-test/tests/gfx/fail-negative-framebuffer-count/expected.png delete mode 100644 render-test/tests/gfx/fail-negative-framebuffer-count/metrics.json delete mode 100644 render-test/tests/gfx/fail-negative-framebuffer-count/style.json delete mode 100644 render-test/tests/gfx/fail-texture-mem-mismatch/expected.png delete mode 100644 render-test/tests/gfx/fail-texture-mem-mismatch/metrics.json delete mode 100644 render-test/tests/gfx/fail-texture-mem-mismatch/style.json delete mode 100644 render-test/tests/gfx/fail-too-few-buffers/expected.png delete mode 100644 render-test/tests/gfx/fail-too-few-buffers/metrics.json delete mode 100644 render-test/tests/gfx/fail-too-few-buffers/style.json delete mode 100644 render-test/tests/gfx/fail-too-few-textures/expected.png delete mode 100644 render-test/tests/gfx/fail-too-few-textures/metrics.json delete mode 100644 render-test/tests/gfx/fail-too-few-textures/style.json delete mode 100644 render-test/tests/gfx/fail-too-many-drawcalls/expected.png delete mode 100644 render-test/tests/gfx/fail-too-many-drawcalls/metrics.json delete mode 100644 render-test/tests/gfx/fail-too-many-drawcalls/style.json delete mode 100644 render-test/tests/gfx/fail-vb-mem-mismatch/expected.png delete mode 100644 render-test/tests/gfx/fail-vb-mem-mismatch/metrics.json delete mode 100644 render-test/tests/gfx/fail-vb-mem-mismatch/style.json delete mode 100644 render-test/tests/gfx/pass-double-probe/expected.png delete mode 100644 render-test/tests/gfx/pass-double-probe/metrics.json delete mode 100644 render-test/tests/gfx/pass-double-probe/style.json delete mode 100644 render-test/tests/gfx/pass-probe-reset/expected.png delete mode 100644 render-test/tests/gfx/pass-probe-reset/metrics.json delete mode 100644 render-test/tests/gfx/pass-probe-reset/style.json delete mode 100644 render-test/tests/gfx/pass/expected.png delete mode 100644 render-test/tests/gfx/pass/metrics.json delete mode 100644 render-test/tests/gfx/pass/style.json delete mode 100644 render-test/tests/memory/fail-memory-size-is-too-big/expected.png delete mode 100644 render-test/tests/memory/fail-memory-size-is-too-big/metrics.json delete mode 100644 render-test/tests/memory/fail-memory-size-is-too-big/style.json delete mode 100644 render-test/tests/memory/fail-memory-size-is-too-small/expected.png delete mode 100644 render-test/tests/memory/fail-memory-size-is-too-small/metrics.json delete mode 100644 render-test/tests/memory/fail-memory-size-is-too-small/style.json delete mode 100644 render-test/tests/memory/pass-memory-size-is-same/expected.png delete mode 100644 render-test/tests/memory/pass-memory-size-is-same/metrics.json delete mode 100644 render-test/tests/memory/pass-memory-size-is-same/style.json delete mode 100644 render-test/tests/network/fail-requests-transferred/expected.png delete mode 100644 render-test/tests/network/fail-requests-transferred/metrics.json delete mode 100644 render-test/tests/network/fail-requests-transferred/style.json delete mode 100644 render-test/tests/network/fail-requests/expected.png delete mode 100644 render-test/tests/network/fail-requests/metrics.json delete mode 100644 render-test/tests/network/fail-requests/style.json delete mode 100644 render-test/tests/network/fail-transferred/expected.png delete mode 100644 render-test/tests/network/fail-transferred/metrics.json delete mode 100644 render-test/tests/network/fail-transferred/style.json delete mode 100644 render-test/tests/network/pass/expected.png delete mode 100644 render-test/tests/network/pass/metrics.json delete mode 100644 render-test/tests/network/pass/style.json delete mode 100644 render-test/tests/should-fail.json (limited to 'render-test') 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 c4ca0e97e4..13f3567233 100644 --- a/render-test/android/app/src/main/assets/to_zip.txt +++ b/render-test/android/app/src/main/assets/to_zip.txt @@ -12,8 +12,9 @@ mapbox-gl-js/test/integration/sprites/ vendor/mapbox-gl-styles/styles/ vendor/mapbox-gl-styles/sprites/ vendor/mvt-fixtures/real-world/ -render-test/ignores/ +metrics/expectations/ +metrics/ignores/ +metrics/tests/ metrics/next-android-render-test-runner/ -render-test/expected/ -android-manifest-probe-network-gfx.json -android-manifest-probe-memory.json +metrics/next-android-render-test-runner-metrics.json +metrics/next-android-render-test-runner-style.json diff --git a/render-test/expected/android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png b/render-test/expected/android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png deleted file mode 100644 index 6a14209d0d..0000000000 Binary files a/render-test/expected/android/render-tests/combinations/symbol-translucent--fill-translucent/expected.png and /dev/null differ diff --git a/render-test/expected/android/render-tests/regressions/mapbox-gl-js#2305/expected.png b/render-test/expected/android/render-tests/regressions/mapbox-gl-js#2305/expected.png deleted file mode 100644 index 99ca724f5b..0000000000 Binary files a/render-test/expected/android/render-tests/regressions/mapbox-gl-js#2305/expected.png and /dev/null differ diff --git a/render-test/expected/android/render-tests/regressions/mapbox-gl-js#5978/expected.png b/render-test/expected/android/render-tests/regressions/mapbox-gl-js#5978/expected.png deleted file mode 100644 index 37fc500689..0000000000 Binary files a/render-test/expected/android/render-tests/regressions/mapbox-gl-js#5978/expected.png and /dev/null differ diff --git a/render-test/expected/android/render-tests/sprites/1x-screen-1x-pattern/expected.png b/render-test/expected/android/render-tests/sprites/1x-screen-1x-pattern/expected.png deleted file mode 100644 index e4564aeee8..0000000000 Binary files a/render-test/expected/android/render-tests/sprites/1x-screen-1x-pattern/expected.png and /dev/null differ diff --git a/render-test/expected/android/render-tests/sprites/1x-screen-2x-pattern/expected.png b/render-test/expected/android/render-tests/sprites/1x-screen-2x-pattern/expected.png deleted file mode 100644 index 8cf3bb4bda..0000000000 Binary files a/render-test/expected/android/render-tests/sprites/1x-screen-2x-pattern/expected.png and /dev/null differ diff --git a/render-test/expected/android/render-tests/sprites/2x-screen-1x-pattern/expected.png b/render-test/expected/android/render-tests/sprites/2x-screen-1x-pattern/expected.png deleted file mode 100644 index 0756d83652..0000000000 Binary files a/render-test/expected/android/render-tests/sprites/2x-screen-1x-pattern/expected.png and /dev/null differ diff --git a/render-test/expected/android/render-tests/sprites/2x-screen-2x-pattern/expected.png b/render-test/expected/android/render-tests/sprites/2x-screen-2x-pattern/expected.png deleted file mode 100644 index a3b27f24a2..0000000000 Binary files a/render-test/expected/android/render-tests/sprites/2x-screen-2x-pattern/expected.png and /dev/null differ diff --git a/render-test/expected/render-tests/debug/collision-lines-overscaled/expected.png b/render-test/expected/render-tests/debug/collision-lines-overscaled/expected.png deleted file mode 100644 index 38eb0d2da6..0000000000 Binary files a/render-test/expected/render-tests/debug/collision-lines-overscaled/expected.png and /dev/null differ diff --git a/render-test/expected/render-tests/debug/collision-lines-pitched/expected.png b/render-test/expected/render-tests/debug/collision-lines-pitched/expected.png deleted file mode 100644 index 416d7d5715..0000000000 Binary files a/render-test/expected/render-tests/debug/collision-lines-pitched/expected.png and /dev/null differ diff --git a/render-test/expected/render-tests/debug/collision-lines/expected.png b/render-test/expected/render-tests/debug/collision-lines/expected.png deleted file mode 100644 index 3f4790a585..0000000000 Binary files a/render-test/expected/render-tests/debug/collision-lines/expected.png and /dev/null differ diff --git a/render-test/expected/render-tests/debug/collision-pitched-wrapped/expected.png b/render-test/expected/render-tests/debug/collision-pitched-wrapped/expected.png deleted file mode 100644 index 9b718c09c0..0000000000 Binary files a/render-test/expected/render-tests/debug/collision-pitched-wrapped/expected.png and /dev/null differ diff --git a/render-test/expected/render-tests/symbol-visibility/visible/expected.png b/render-test/expected/render-tests/symbol-visibility/visible/expected.png deleted file mode 100644 index 8da157772a..0000000000 Binary files a/render-test/expected/render-tests/symbol-visibility/visible/expected.png and /dev/null differ diff --git a/render-test/expected/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png b/render-test/expected/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png deleted file mode 100644 index cd690ca152..0000000000 Binary files a/render-test/expected/render-tests/text-pitch-alignment/auto-text-rotation-alignment-map/expected.png and /dev/null differ diff --git a/render-test/expected/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png b/render-test/expected/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png deleted file mode 100644 index cd690ca152..0000000000 Binary files a/render-test/expected/render-tests/text-pitch-alignment/map-text-rotation-alignment-map/expected.png and /dev/null differ diff --git a/render-test/expected/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png b/render-test/expected/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png deleted file mode 100644 index 764d4a0b24..0000000000 Binary files a/render-test/expected/render-tests/text-pitch-alignment/viewport-text-rotation-alignment-map/expected.png and /dev/null differ diff --git a/render-test/expected/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png b/render-test/expected/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png deleted file mode 100644 index 4e3d012844..0000000000 Binary files a/render-test/expected/render-tests/text-variable-anchor/pitched-rotated-debug/expected.png and /dev/null differ diff --git a/render-test/expected/render-tests/text-variable-anchor/rotated-offset/expected.png b/render-test/expected/render-tests/text-variable-anchor/rotated-offset/expected.png deleted file mode 100644 index 13690d147c..0000000000 Binary files a/render-test/expected/render-tests/text-variable-anchor/rotated-offset/expected.png and /dev/null differ diff --git a/render-test/expected/tests/memory/pass-memory-size-is-same/expected.png b/render-test/expected/tests/memory/pass-memory-size-is-same/expected.png deleted file mode 100644 index 0858c19f05..0000000000 Binary files a/render-test/expected/tests/memory/pass-memory-size-is-same/expected.png and /dev/null differ diff --git a/render-test/ignores/android-temp-fail.json b/render-test/ignores/android-temp-fail.json deleted file mode 100644 index 655c697528..0000000000 --- a/render-test/ignores/android-temp-fail.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen": "Temporarily fails as android test app does not derefence symbolinks in sprites folder.", - "render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen": "Temporarily fails as android test app does not derefence symbolinks in sprites folder.", - "render-tests/regressions/mapbox-gl-native#9976": "Needs to be investigated and fixed.", - "render-tests/regressions/mapbox-gl-js#5911a": "Needs to be investigated and fixed.", - "render-tests/line-pattern/overscaled": "Needs to be investigated and fixed.", - "render-tests/runtime-styling/image-add-pattern": "Needs to be investigated and fixed.", - "render-tests/runtime-styling/image-update-pattern": "Needs to be investigated and fixed." -} diff --git a/render-test/ignores/linux-ignores.json b/render-test/ignores/linux-ignores.json deleted file mode 100644 index d5a1a85c6c..0000000000 --- a/render-test/ignores/linux-ignores.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "render-tests/regressions/mapbox-gl-js#7066": "Failing with mbgl-render-test", - "render-tests/regressions/mapbox-gl-js#5642": "Failing with mbgl-render-test", - "render-tests/line-pattern/opacity": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/15320", - "render-tests/fill-opacity/zoom-and-property-function-pattern": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/15322", - "render-tests/fill-pattern/literal": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/14423", - "render-tests/fill-pattern/opacity": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/14870", - "render-tests/fill-pattern/zoomed": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/14768", - "render-tests/line-translate/literal": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/14859" -} - diff --git a/render-test/linux-manifest.json b/render-test/linux-manifest.json deleted file mode 100644 index 91b062c2cc..0000000000 --- a/render-test/linux-manifest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "base_test_path":"../mapbox-gl-js/test/integration", - "expectation_paths":["expected/"], - "ignore_paths":["../platform/node/test/ignores.json", "../render-test/ignores/linux-ignores.json"], - "vendor_path":"../vendor", - "asset_path": "../mapbox-gl-js/test/integration" -} \ No newline at end of file diff --git a/render-test/linux-probe-manifest.json b/render-test/linux-probe-manifest.json deleted file mode 100644 index f0ebeedd10..0000000000 --- a/render-test/linux-probe-manifest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "probe_test_path":".", - "expectation_paths":["expected/render-tests"], - "ignore_paths":["../render-test/tests/should-fail.json"], - "vendor_path":"../vendor", - "asset_path": "../mapbox-gl-js/test/integration" -} \ No newline at end of file diff --git a/render-test/linux-query-manifest.json b/render-test/linux-query-manifest.json deleted file mode 100644 index 6d2071b19f..0000000000 --- a/render-test/linux-query-manifest.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "base_test_path":"../mapbox-gl-js/test/integration", - "ignore_paths":["../platform/node/test/ignores.json", "../render-test/ignores/linux-ignores.json"], - "vendor_path":"../vendor", - "asset_path": "../mapbox-gl-js/test/integration" -} \ No newline at end of file diff --git a/render-test/mac-ignores.json b/render-test/mac-ignores.json deleted file mode 100644 index 87bef31c5c..0000000000 --- a/render-test/mac-ignores.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "render-tests/regressions/mapbox-gl-js#7066": "Failing with mbgl-render-test", - "render-tests/regressions/mapbox-gl-js#5642": "Failing with mbgl-render-test" -} - diff --git a/render-test/mac-manifest.json b/render-test/mac-manifest.json deleted file mode 100644 index 13a225cf4e..0000000000 --- a/render-test/mac-manifest.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "base_test_path":"../mapbox-gl-js/test/integration", - "expectation_paths":["expected/"], - "ignore_paths":["../platform/node/test/ignores.json", "../render-test/mac-ignores.json", "../render-test/tests/should-fail.json"], - "vendor_path":"../vendor", - "asset_path": "../mapbox-gl-js/test/integration" -} \ No newline at end of file diff --git a/render-test/mac-probe-manifest.json b/render-test/mac-probe-manifest.json deleted file mode 100644 index 154f6676dd..0000000000 --- a/render-test/mac-probe-manifest.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "probe_test_path":".", - "expectation_paths":["expected/"], - "ignore_paths":["../render-test/mac-ignores.json", "../render-test/tests/should-fail.json"], - "vendor_path":"../vendor", - "asset_path": "../mapbox-gl-js/test/integration", - "metric_path":"metrics/mac/" -} \ No newline at end of file diff --git a/render-test/metrics/mac/tests/memory/pass-memory-size-is-same/metrics.json b/render-test/metrics/mac/tests/memory/pass-memory-size-is-same/metrics.json deleted file mode 100644 index 0c6c8dc353..0000000000 --- a/render-test/metrics/mac/tests/memory/pass-memory-size-is-same/metrics.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "memory": [ - [ - "after setZoom 0.9", - 21439, - 46 - ], - [ - "end", - 23385, - 91 - ], - [ - "start", - 0, - 0 - ] - ] -} diff --git a/render-test/tests/file-size/fail-file-doesnt-match/expected.png b/render-test/tests/file-size/fail-file-doesnt-match/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/file-size/fail-file-doesnt-match/expected.png and /dev/null differ diff --git a/render-test/tests/file-size/fail-file-doesnt-match/metrics.json b/render-test/tests/file-size/fail-file-doesnt-match/metrics.json deleted file mode 100644 index c0002163d6..0000000000 --- a/render-test/tests/file-size/fail-file-doesnt-match/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "file-size": [ - [ - "image", - "expected.aaa", - 169 - ], - [ - "style", - "style.bbbb", - 510 - ] - ] -} diff --git a/render-test/tests/file-size/fail-file-doesnt-match/style.json b/render-test/tests/file-size/fail-file-doesnt-match/style.json deleted file mode 100644 index 839a8d4a12..0000000000 --- a/render-test/tests/file-size/fail-file-doesnt-match/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeFileSize", "style", "style.json", 0], - ["probeFileSize", "image", "expected.png", 0] - ], - "width": 64, - "height": 64 - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/file-size/fail-file-not-found/expected.png b/render-test/tests/file-size/fail-file-not-found/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/file-size/fail-file-not-found/expected.png and /dev/null differ diff --git a/render-test/tests/file-size/fail-file-not-found/style.json b/render-test/tests/file-size/fail-file-not-found/style.json deleted file mode 100644 index 74054e1f40..0000000000 --- a/render-test/tests/file-size/fail-file-not-found/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeFileSize", "style", "style.aaaa", 0], - ["probeFileSize", "image", "expected.bbb", 0] - ], - "width": 64, - "height": 64 - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/file-size/fail-size-is-over/expected.png b/render-test/tests/file-size/fail-size-is-over/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/file-size/fail-size-is-over/expected.png and /dev/null differ diff --git a/render-test/tests/file-size/fail-size-is-over/metrics.json b/render-test/tests/file-size/fail-size-is-over/metrics.json deleted file mode 100644 index bc194081cf..0000000000 --- a/render-test/tests/file-size/fail-size-is-over/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "file-size": [ - [ - "image", - "expected.png", - 999 - ], - [ - "style", - "style.json", - 999 - ] - ] -} diff --git a/render-test/tests/file-size/fail-size-is-over/style.json b/render-test/tests/file-size/fail-size-is-over/style.json deleted file mode 100644 index 839a8d4a12..0000000000 --- a/render-test/tests/file-size/fail-size-is-over/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeFileSize", "style", "style.json", 0], - ["probeFileSize", "image", "expected.png", 0] - ], - "width": 64, - "height": 64 - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/file-size/fail-size-is-under/expected.png b/render-test/tests/file-size/fail-size-is-under/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/file-size/fail-size-is-under/expected.png and /dev/null differ diff --git a/render-test/tests/file-size/fail-size-is-under/metrics.json b/render-test/tests/file-size/fail-size-is-under/metrics.json deleted file mode 100644 index d288c2ceee..0000000000 --- a/render-test/tests/file-size/fail-size-is-under/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "file-size": [ - [ - "image", - "expected.png", - 100 - ], - [ - "style", - "style.json", - 100 - ] - ] -} diff --git a/render-test/tests/file-size/fail-size-is-under/style.json b/render-test/tests/file-size/fail-size-is-under/style.json deleted file mode 100644 index 839a8d4a12..0000000000 --- a/render-test/tests/file-size/fail-size-is-under/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeFileSize", "style", "style.json", 0], - ["probeFileSize", "image", "expected.png", 0] - ], - "width": 64, - "height": 64 - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/expected.png b/render-test/tests/file-size/pass-size-is-in-tolerance-higher/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/expected.png and /dev/null differ diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/metrics.json b/render-test/tests/file-size/pass-size-is-in-tolerance-higher/metrics.json deleted file mode 100644 index d0c0c9d7b6..0000000000 --- a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "file-size": [ - [ - "image", - "expected.png", - 177 - ], - [ - "style", - "style.json", - 548 - ] - ] -} diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/style.json b/render-test/tests/file-size/pass-size-is-in-tolerance-higher/style.json deleted file mode 100644 index d021673ba5..0000000000 --- a/render-test/tests/file-size/pass-size-is-in-tolerance-higher/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeFileSize", "style", "style.json", 0.05], - ["probeFileSize", "image", "expected.png", 0.05] - ], - "width": 64, - "height": 64 - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/expected.png b/render-test/tests/file-size/pass-size-is-in-tolerance-lower/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/expected.png and /dev/null differ diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/metrics.json b/render-test/tests/file-size/pass-size-is-in-tolerance-lower/metrics.json deleted file mode 100644 index d62b751d5a..0000000000 --- a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "file-size": [ - [ - "image", - "expected.png", - 161 - ], - [ - "style", - "style.json", - 498 - ] - ] -} diff --git a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/style.json b/render-test/tests/file-size/pass-size-is-in-tolerance-lower/style.json deleted file mode 100644 index d021673ba5..0000000000 --- a/render-test/tests/file-size/pass-size-is-in-tolerance-lower/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeFileSize", "style", "style.json", 0.05], - ["probeFileSize", "image", "expected.png", 0.05] - ], - "width": 64, - "height": 64 - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/file-size/pass-size-is-same/expected.png b/render-test/tests/file-size/pass-size-is-same/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/file-size/pass-size-is-same/expected.png and /dev/null differ diff --git a/render-test/tests/file-size/pass-size-is-same/metrics.json b/render-test/tests/file-size/pass-size-is-same/metrics.json deleted file mode 100644 index 15f8c35617..0000000000 --- a/render-test/tests/file-size/pass-size-is-same/metrics.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "file-size": [ - [ - "image", - "expected.png", - 169 - ], - [ - "image-compressed", - "expected.png", - 167 - ], - [ - "style", - "style.json", - 674 - ], - [ - "style-compressed", - "style.json", - 256 - ] - ] -} diff --git a/render-test/tests/file-size/pass-size-is-same/style.json b/render-test/tests/file-size/pass-size-is-same/style.json deleted file mode 100644 index b13f37500a..0000000000 --- a/render-test/tests/file-size/pass-size-is-same/style.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeFileSize", "image", "expected.png", 0], - ["probeFileSize", "image-compressed", "expected.png", 0, "compressed"], - ["probeFileSize", "style", "style.json", 0], - ["probeFileSize", "style-compressed", "style.json", 0, "compressed"] - ], - "width": 64, - "height": 64 - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/gfx/fail-ib-mem-mismatch/expected.png b/render-test/tests/gfx/fail-ib-mem-mismatch/expected.png deleted file mode 100644 index 4b5ea75a25..0000000000 Binary files a/render-test/tests/gfx/fail-ib-mem-mismatch/expected.png and /dev/null differ diff --git a/render-test/tests/gfx/fail-ib-mem-mismatch/metrics.json b/render-test/tests/gfx/fail-ib-mem-mismatch/metrics.json deleted file mode 100644 index 2b5c9c3eda..0000000000 --- a/render-test/tests/gfx/fail-ib-mem-mismatch/metrics.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "gfx":[ - ["gfx 0", 36, 14, 63, 1, [371208, 371208], [68598, 65536], [74592, 74592]] - ] -} diff --git a/render-test/tests/gfx/fail-ib-mem-mismatch/style.json b/render-test/tests/gfx/fail-ib-mem-mismatch/style.json deleted file mode 100644 index 6ae3eecb8c..0000000000 --- a/render-test/tests/gfx/fail-ib-mem-mismatch/style.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 512, - "height": 512, - "operations": [ - ["setStyle", "local://styles/uruguay.json"], - ["setZoom", 9 ], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.865788] ], - ["probeGFX", "gfx 0"], - ["probeGFXEnd"] - ] - } - }, - "sources": {}, - "layers": [] - } - \ No newline at end of file diff --git a/render-test/tests/gfx/fail-negative-framebuffer-count/expected.png b/render-test/tests/gfx/fail-negative-framebuffer-count/expected.png deleted file mode 100644 index 4b5ea75a25..0000000000 Binary files a/render-test/tests/gfx/fail-negative-framebuffer-count/expected.png and /dev/null differ diff --git a/render-test/tests/gfx/fail-negative-framebuffer-count/metrics.json b/render-test/tests/gfx/fail-negative-framebuffer-count/metrics.json deleted file mode 100644 index e92cffa571..0000000000 --- a/render-test/tests/gfx/fail-negative-framebuffer-count/metrics.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "gfx":[ - ["gfx 0", 36, 14, 63, -1, [371208, 371208], [68598, 68598], [74592, 74592]] - ] -} diff --git a/render-test/tests/gfx/fail-negative-framebuffer-count/style.json b/render-test/tests/gfx/fail-negative-framebuffer-count/style.json deleted file mode 100644 index 6ae3eecb8c..0000000000 --- a/render-test/tests/gfx/fail-negative-framebuffer-count/style.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 512, - "height": 512, - "operations": [ - ["setStyle", "local://styles/uruguay.json"], - ["setZoom", 9 ], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.865788] ], - ["probeGFX", "gfx 0"], - ["probeGFXEnd"] - ] - } - }, - "sources": {}, - "layers": [] - } - \ No newline at end of file diff --git a/render-test/tests/gfx/fail-texture-mem-mismatch/expected.png b/render-test/tests/gfx/fail-texture-mem-mismatch/expected.png deleted file mode 100644 index 4b5ea75a25..0000000000 Binary files a/render-test/tests/gfx/fail-texture-mem-mismatch/expected.png and /dev/null differ diff --git a/render-test/tests/gfx/fail-texture-mem-mismatch/metrics.json b/render-test/tests/gfx/fail-texture-mem-mismatch/metrics.json deleted file mode 100644 index fc6f55025f..0000000000 --- a/render-test/tests/gfx/fail-texture-mem-mismatch/metrics.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "gfx":[ - ["gfx 0", 36, 14, 63, 1, [371208, 370000], [68598, 68598], [74592, 74592]] - ] -} diff --git a/render-test/tests/gfx/fail-texture-mem-mismatch/style.json b/render-test/tests/gfx/fail-texture-mem-mismatch/style.json deleted file mode 100644 index 6ae3eecb8c..0000000000 --- a/render-test/tests/gfx/fail-texture-mem-mismatch/style.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 512, - "height": 512, - "operations": [ - ["setStyle", "local://styles/uruguay.json"], - ["setZoom", 9 ], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.865788] ], - ["probeGFX", "gfx 0"], - ["probeGFXEnd"] - ] - } - }, - "sources": {}, - "layers": [] - } - \ No newline at end of file diff --git a/render-test/tests/gfx/fail-too-few-buffers/expected.png b/render-test/tests/gfx/fail-too-few-buffers/expected.png deleted file mode 100644 index 4b5ea75a25..0000000000 Binary files a/render-test/tests/gfx/fail-too-few-buffers/expected.png and /dev/null differ diff --git a/render-test/tests/gfx/fail-too-few-buffers/metrics.json b/render-test/tests/gfx/fail-too-few-buffers/metrics.json deleted file mode 100644 index 07b59adeed..0000000000 --- a/render-test/tests/gfx/fail-too-few-buffers/metrics.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "gfx":[ - ["gfx 0", 36, 14, 1000, 1, [371208, 371208], [68598, 68598], [74592, 74592]] - ] -} diff --git a/render-test/tests/gfx/fail-too-few-buffers/style.json b/render-test/tests/gfx/fail-too-few-buffers/style.json deleted file mode 100644 index 6ae3eecb8c..0000000000 --- a/render-test/tests/gfx/fail-too-few-buffers/style.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 512, - "height": 512, - "operations": [ - ["setStyle", "local://styles/uruguay.json"], - ["setZoom", 9 ], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.865788] ], - ["probeGFX", "gfx 0"], - ["probeGFXEnd"] - ] - } - }, - "sources": {}, - "layers": [] - } - \ No newline at end of file diff --git a/render-test/tests/gfx/fail-too-few-textures/expected.png b/render-test/tests/gfx/fail-too-few-textures/expected.png deleted file mode 100644 index 4b5ea75a25..0000000000 Binary files a/render-test/tests/gfx/fail-too-few-textures/expected.png and /dev/null differ diff --git a/render-test/tests/gfx/fail-too-few-textures/metrics.json b/render-test/tests/gfx/fail-too-few-textures/metrics.json deleted file mode 100644 index 805d7035e2..0000000000 --- a/render-test/tests/gfx/fail-too-few-textures/metrics.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "gfx":[ - ["gfx 0", 36, 1000, 63, 1, [371208, 371208], [68598, 68598], [74592, 74592]] - ] -} diff --git a/render-test/tests/gfx/fail-too-few-textures/style.json b/render-test/tests/gfx/fail-too-few-textures/style.json deleted file mode 100644 index 6ae3eecb8c..0000000000 --- a/render-test/tests/gfx/fail-too-few-textures/style.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 512, - "height": 512, - "operations": [ - ["setStyle", "local://styles/uruguay.json"], - ["setZoom", 9 ], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.865788] ], - ["probeGFX", "gfx 0"], - ["probeGFXEnd"] - ] - } - }, - "sources": {}, - "layers": [] - } - \ No newline at end of file diff --git a/render-test/tests/gfx/fail-too-many-drawcalls/expected.png b/render-test/tests/gfx/fail-too-many-drawcalls/expected.png deleted file mode 100644 index 4b5ea75a25..0000000000 Binary files a/render-test/tests/gfx/fail-too-many-drawcalls/expected.png and /dev/null differ diff --git a/render-test/tests/gfx/fail-too-many-drawcalls/metrics.json b/render-test/tests/gfx/fail-too-many-drawcalls/metrics.json deleted file mode 100644 index 9abb546450..0000000000 --- a/render-test/tests/gfx/fail-too-many-drawcalls/metrics.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "gfx":[ - ["gfx 0", 28, 14, 63, 1, [371208, 371208], [68598, 68598], [74592, 74592]] - ] -} diff --git a/render-test/tests/gfx/fail-too-many-drawcalls/style.json b/render-test/tests/gfx/fail-too-many-drawcalls/style.json deleted file mode 100644 index 6ae3eecb8c..0000000000 --- a/render-test/tests/gfx/fail-too-many-drawcalls/style.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 512, - "height": 512, - "operations": [ - ["setStyle", "local://styles/uruguay.json"], - ["setZoom", 9 ], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.865788] ], - ["probeGFX", "gfx 0"], - ["probeGFXEnd"] - ] - } - }, - "sources": {}, - "layers": [] - } - \ No newline at end of file diff --git a/render-test/tests/gfx/fail-vb-mem-mismatch/expected.png b/render-test/tests/gfx/fail-vb-mem-mismatch/expected.png deleted file mode 100644 index 4b5ea75a25..0000000000 Binary files a/render-test/tests/gfx/fail-vb-mem-mismatch/expected.png and /dev/null differ diff --git a/render-test/tests/gfx/fail-vb-mem-mismatch/metrics.json b/render-test/tests/gfx/fail-vb-mem-mismatch/metrics.json deleted file mode 100644 index fd25dbd68b..0000000000 --- a/render-test/tests/gfx/fail-vb-mem-mismatch/metrics.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "gfx":[ - ["gfx 0", 36, 14, 63, 1, [371208, 371208], [68598, 68598], [74592, 7654321]] - ] -} diff --git a/render-test/tests/gfx/fail-vb-mem-mismatch/style.json b/render-test/tests/gfx/fail-vb-mem-mismatch/style.json deleted file mode 100644 index 6ae3eecb8c..0000000000 --- a/render-test/tests/gfx/fail-vb-mem-mismatch/style.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 512, - "height": 512, - "operations": [ - ["setStyle", "local://styles/uruguay.json"], - ["setZoom", 9 ], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.865788] ], - ["probeGFX", "gfx 0"], - ["probeGFXEnd"] - ] - } - }, - "sources": {}, - "layers": [] - } - \ No newline at end of file diff --git a/render-test/tests/gfx/pass-double-probe/expected.png b/render-test/tests/gfx/pass-double-probe/expected.png deleted file mode 100644 index 9f4e48ab24..0000000000 Binary files a/render-test/tests/gfx/pass-double-probe/expected.png and /dev/null differ diff --git a/render-test/tests/gfx/pass-double-probe/metrics.json b/render-test/tests/gfx/pass-double-probe/metrics.json deleted file mode 100644 index f2641a9a16..0000000000 --- a/render-test/tests/gfx/pass-double-probe/metrics.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "gfx":[ - ["gfx 0", 36, 13, 63, 1, [240136, 240136], [68598, 68598], [74592, 74592]], - ["gfx 1", 32, 17, 85, 1, [325008, 325008], [84926, 84926], [100224, 100224]] - ] -} diff --git a/render-test/tests/gfx/pass-double-probe/style.json b/render-test/tests/gfx/pass-double-probe/style.json deleted file mode 100644 index 395f4ce50a..0000000000 --- a/render-test/tests/gfx/pass-double-probe/style.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 512, - "height": 512, - "operations": [ - ["setStyle", "local://styles/uruguay.json"], - ["setZoom", 9 ], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.865788] ], - ["probeGFX", "gfx 0"], - ["setCenter", [-56.509552, -32.745788] ], - ["probeGFX", "gfx 1"], - ["probeGFXEnd"] - ] - } - }, - "sources": {}, - "layers": [] - } - \ No newline at end of file diff --git a/render-test/tests/gfx/pass-probe-reset/expected.png b/render-test/tests/gfx/pass-probe-reset/expected.png deleted file mode 100644 index 9f4e48ab24..0000000000 Binary files a/render-test/tests/gfx/pass-probe-reset/expected.png and /dev/null differ diff --git a/render-test/tests/gfx/pass-probe-reset/metrics.json b/render-test/tests/gfx/pass-probe-reset/metrics.json deleted file mode 100644 index 0e42bc1697..0000000000 --- a/render-test/tests/gfx/pass-probe-reset/metrics.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "gfx":[ - ["gfx 0", 36, 13, 63, 1, [240136, 240136], [68598, 68598], [74592, 74592]], - ["gfx 1", 32, 17, 85, 1, [84872, 84872], [16328, 16328], [25632, 25632]] - ] -} diff --git a/render-test/tests/gfx/pass-probe-reset/style.json b/render-test/tests/gfx/pass-probe-reset/style.json deleted file mode 100644 index 698d95bb74..0000000000 --- a/render-test/tests/gfx/pass-probe-reset/style.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 512, - "height": 512, - "operations": [ - ["setStyle", "local://styles/uruguay.json"], - ["setZoom", 9 ], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.865788] ], - ["probeGFX", "gfx 0"], - ["probeGFXEnd"], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.745788] ], - ["probeGFX", "gfx 1"], - ["probeGFXEnd"] - ] - } - }, - "sources": {}, - "layers": [] - } - \ No newline at end of file diff --git a/render-test/tests/gfx/pass/expected.png b/render-test/tests/gfx/pass/expected.png deleted file mode 100644 index 4b5ea75a25..0000000000 Binary files a/render-test/tests/gfx/pass/expected.png and /dev/null differ diff --git a/render-test/tests/gfx/pass/metrics.json b/render-test/tests/gfx/pass/metrics.json deleted file mode 100644 index 67ecec5d78..0000000000 --- a/render-test/tests/gfx/pass/metrics.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "gfx":[ - ["gfx 0", 36, 13, 63, 1, [240136, 240136], [68598, 68598], [74592, 74592]] - ] -} diff --git a/render-test/tests/gfx/pass/style.json b/render-test/tests/gfx/pass/style.json deleted file mode 100644 index 6ae3eecb8c..0000000000 --- a/render-test/tests/gfx/pass/style.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 512, - "height": 512, - "operations": [ - ["setStyle", "local://styles/uruguay.json"], - ["setZoom", 9 ], - ["probeGFXStart"], - ["setCenter", [-56.509552, -32.865788] ], - ["probeGFX", "gfx 0"], - ["probeGFXEnd"] - ] - } - }, - "sources": {}, - "layers": [] - } - \ No newline at end of file diff --git a/render-test/tests/memory/fail-memory-size-is-too-big/expected.png b/render-test/tests/memory/fail-memory-size-is-too-big/expected.png deleted file mode 100644 index 0858c19f05..0000000000 Binary files a/render-test/tests/memory/fail-memory-size-is-too-big/expected.png and /dev/null differ diff --git a/render-test/tests/memory/fail-memory-size-is-too-big/metrics.json b/render-test/tests/memory/fail-memory-size-is-too-big/metrics.json deleted file mode 100644 index f13f54410d..0000000000 --- a/render-test/tests/memory/fail-memory-size-is-too-big/metrics.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "memory": [ - [ - "after setZoom 0.9", - 21439, - 57 - ], - [ - "end", - 20000, - 108 - ], - [ - "start", - 0, - 0 - ] - ] -} diff --git a/render-test/tests/memory/fail-memory-size-is-too-big/style.json b/render-test/tests/memory/fail-memory-size-is-too-big/style.json deleted file mode 100644 index b2805ef34f..0000000000 --- a/render-test/tests/memory/fail-memory-size-is-too-big/style.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 64, - "height": 64, - "operations": [ - [ "wait" ], - [ "probeMemoryStart" ], - [ "probeMemory", "start" ], - [ - "setZoom", - 0.9 - ], - [ - "wait" - ], - [ "probeMemory", "after setZoom 0.9", 0.005 ], - [ - "setLayerZoomRange", - "circle", - 1, - 2 - ], - [ - "wait" - ], - [ "probeMemory", "end", 0.005 ], - [ "probeMemoryEnd" ] - ] - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/memory/fail-memory-size-is-too-small/expected.png b/render-test/tests/memory/fail-memory-size-is-too-small/expected.png deleted file mode 100644 index 0858c19f05..0000000000 Binary files a/render-test/tests/memory/fail-memory-size-is-too-small/expected.png and /dev/null differ diff --git a/render-test/tests/memory/fail-memory-size-is-too-small/metrics.json b/render-test/tests/memory/fail-memory-size-is-too-small/metrics.json deleted file mode 100644 index 9aba39584a..0000000000 --- a/render-test/tests/memory/fail-memory-size-is-too-small/metrics.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "memory": [ - [ - "after setZoom 0.9", - 21439, - 57 - ], - [ - "end", - 60000, - 108 - ], - [ - "start", - 0, - 0 - ] - ] -} diff --git a/render-test/tests/memory/fail-memory-size-is-too-small/style.json b/render-test/tests/memory/fail-memory-size-is-too-small/style.json deleted file mode 100644 index b2805ef34f..0000000000 --- a/render-test/tests/memory/fail-memory-size-is-too-small/style.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 64, - "height": 64, - "operations": [ - [ "wait" ], - [ "probeMemoryStart" ], - [ "probeMemory", "start" ], - [ - "setZoom", - 0.9 - ], - [ - "wait" - ], - [ "probeMemory", "after setZoom 0.9", 0.005 ], - [ - "setLayerZoomRange", - "circle", - 1, - 2 - ], - [ - "wait" - ], - [ "probeMemory", "end", 0.005 ], - [ "probeMemoryEnd" ] - ] - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/memory/pass-memory-size-is-same/expected.png b/render-test/tests/memory/pass-memory-size-is-same/expected.png deleted file mode 100644 index 0858c19f05..0000000000 Binary files a/render-test/tests/memory/pass-memory-size-is-same/expected.png and /dev/null differ diff --git a/render-test/tests/memory/pass-memory-size-is-same/metrics.json b/render-test/tests/memory/pass-memory-size-is-same/metrics.json deleted file mode 100644 index 3ffbe1b732..0000000000 --- a/render-test/tests/memory/pass-memory-size-is-same/metrics.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "memory": [ - [ - "after setZoom 0.9", - 21439, - 57 - ], - [ - "end", - 23385, - 108 - ], - [ - "start", - 0, - 0 - ] - ] -} diff --git a/render-test/tests/memory/pass-memory-size-is-same/style.json b/render-test/tests/memory/pass-memory-size-is-same/style.json deleted file mode 100644 index d1c09f69f9..0000000000 --- a/render-test/tests/memory/pass-memory-size-is-same/style.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 64, - "height": 64, - "operations": [ - [ "wait" ], - [ "probeMemoryStart" ], - [ "probeMemory", "start" ], - [ - "setZoom", - 0.9 - ], - [ - "wait" - ], - [ "probeMemory", "after setZoom 0.9", 0.01 ], - [ - "setLayerZoomRange", - "circle", - 1, - 2 - ], - [ - "wait" - ], - [ "probeMemory", "end", 0.01 ], - [ "probeMemoryEnd" ] - ] - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/network/fail-requests-transferred/expected.png b/render-test/tests/network/fail-requests-transferred/expected.png deleted file mode 100644 index b63b151765..0000000000 Binary files a/render-test/tests/network/fail-requests-transferred/expected.png and /dev/null differ diff --git a/render-test/tests/network/fail-requests-transferred/metrics.json b/render-test/tests/network/fail-requests-transferred/metrics.json deleted file mode 100644 index 1a200ca38f..0000000000 --- a/render-test/tests/network/fail-requests-transferred/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "network": [ - [ - "end", - 2, - 200000 - ], - [ - "start", - 0, - 0 - ] - ] -} \ No newline at end of file diff --git a/render-test/tests/network/fail-requests-transferred/style.json b/render-test/tests/network/fail-requests-transferred/style.json deleted file mode 100644 index ef94ddc748..0000000000 --- a/render-test/tests/network/fail-requests-transferred/style.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeNetworkStart"], - ["probeNetwork", "start"], - ["wait"], - ["probeNetwork", "end"], - ["probeNetworkEnd"] - ], - "height": 256, - "width": 1024 - } - }, - "center": [ - -73, - 15 - ], - "zoom": 4.5, - "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/mapbox.mapbox-streets-v7/{z}-{x}-{y}.mvt" - ] - } - }, - "glyphs": "local://glyphs/{fontstack}/{range}.pbf", - "layers": [ - { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "line-center", - "type": "symbol", - "source": "mapbox", - "source-layer": "marine_label", - "layout": { - "text-field": "{name_en}", - "symbol-placement": "line-center", - "text-allow-overlap": true, - "text-size": 35, - "text-letter-spacing": 0.4, - "text-offset": [3, 0], - "text-font": [ - "Open Sans Semibold", - "Arial Unicode MS Bold" - ] - } - }, - { - "id": "line", - "type": "line", - "source": "mapbox", - "source-layer": "marine_label", - "paint": { - "line-width": 1 - } - } - ] -} diff --git a/render-test/tests/network/fail-requests/expected.png b/render-test/tests/network/fail-requests/expected.png deleted file mode 100644 index b63b151765..0000000000 Binary files a/render-test/tests/network/fail-requests/expected.png and /dev/null differ diff --git a/render-test/tests/network/fail-requests/metrics.json b/render-test/tests/network/fail-requests/metrics.json deleted file mode 100644 index 81c9b8a5d4..0000000000 --- a/render-test/tests/network/fail-requests/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "network": [ - [ - "end", - 2, - 183111 - ], - [ - "start", - 0, - 0 - ] - ] -} \ No newline at end of file diff --git a/render-test/tests/network/fail-requests/style.json b/render-test/tests/network/fail-requests/style.json deleted file mode 100644 index ef94ddc748..0000000000 --- a/render-test/tests/network/fail-requests/style.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeNetworkStart"], - ["probeNetwork", "start"], - ["wait"], - ["probeNetwork", "end"], - ["probeNetworkEnd"] - ], - "height": 256, - "width": 1024 - } - }, - "center": [ - -73, - 15 - ], - "zoom": 4.5, - "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/mapbox.mapbox-streets-v7/{z}-{x}-{y}.mvt" - ] - } - }, - "glyphs": "local://glyphs/{fontstack}/{range}.pbf", - "layers": [ - { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "line-center", - "type": "symbol", - "source": "mapbox", - "source-layer": "marine_label", - "layout": { - "text-field": "{name_en}", - "symbol-placement": "line-center", - "text-allow-overlap": true, - "text-size": 35, - "text-letter-spacing": 0.4, - "text-offset": [3, 0], - "text-font": [ - "Open Sans Semibold", - "Arial Unicode MS Bold" - ] - } - }, - { - "id": "line", - "type": "line", - "source": "mapbox", - "source-layer": "marine_label", - "paint": { - "line-width": 1 - } - } - ] -} diff --git a/render-test/tests/network/fail-transferred/expected.png b/render-test/tests/network/fail-transferred/expected.png deleted file mode 100644 index b63b151765..0000000000 Binary files a/render-test/tests/network/fail-transferred/expected.png and /dev/null differ diff --git a/render-test/tests/network/fail-transferred/metrics.json b/render-test/tests/network/fail-transferred/metrics.json deleted file mode 100644 index 20b42d5b9b..0000000000 --- a/render-test/tests/network/fail-transferred/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "network": [ - [ - "end", - 3, - 100000 - ], - [ - "start", - 0, - 0 - ] - ] -} \ No newline at end of file diff --git a/render-test/tests/network/fail-transferred/style.json b/render-test/tests/network/fail-transferred/style.json deleted file mode 100644 index ef94ddc748..0000000000 --- a/render-test/tests/network/fail-transferred/style.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeNetworkStart"], - ["probeNetwork", "start"], - ["wait"], - ["probeNetwork", "end"], - ["probeNetworkEnd"] - ], - "height": 256, - "width": 1024 - } - }, - "center": [ - -73, - 15 - ], - "zoom": 4.5, - "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/mapbox.mapbox-streets-v7/{z}-{x}-{y}.mvt" - ] - } - }, - "glyphs": "local://glyphs/{fontstack}/{range}.pbf", - "layers": [ - { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "line-center", - "type": "symbol", - "source": "mapbox", - "source-layer": "marine_label", - "layout": { - "text-field": "{name_en}", - "symbol-placement": "line-center", - "text-allow-overlap": true, - "text-size": 35, - "text-letter-spacing": 0.4, - "text-offset": [3, 0], - "text-font": [ - "Open Sans Semibold", - "Arial Unicode MS Bold" - ] - } - }, - { - "id": "line", - "type": "line", - "source": "mapbox", - "source-layer": "marine_label", - "paint": { - "line-width": 1 - } - } - ] -} diff --git a/render-test/tests/network/pass/expected.png b/render-test/tests/network/pass/expected.png deleted file mode 100644 index b63b151765..0000000000 Binary files a/render-test/tests/network/pass/expected.png and /dev/null differ diff --git a/render-test/tests/network/pass/metrics.json b/render-test/tests/network/pass/metrics.json deleted file mode 100644 index 6afd106a45..0000000000 --- a/render-test/tests/network/pass/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "network": [ - [ - "end", - 3, - 183111 - ], - [ - "start", - 0, - 0 - ] - ] -} \ No newline at end of file diff --git a/render-test/tests/network/pass/style.json b/render-test/tests/network/pass/style.json deleted file mode 100644 index ef94ddc748..0000000000 --- a/render-test/tests/network/pass/style.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeNetworkStart"], - ["probeNetwork", "start"], - ["wait"], - ["probeNetwork", "end"], - ["probeNetworkEnd"] - ], - "height": 256, - "width": 1024 - } - }, - "center": [ - -73, - 15 - ], - "zoom": 4.5, - "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/mapbox.mapbox-streets-v7/{z}-{x}-{y}.mvt" - ] - } - }, - "glyphs": "local://glyphs/{fontstack}/{range}.pbf", - "layers": [ - { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "line-center", - "type": "symbol", - "source": "mapbox", - "source-layer": "marine_label", - "layout": { - "text-field": "{name_en}", - "symbol-placement": "line-center", - "text-allow-overlap": true, - "text-size": 35, - "text-letter-spacing": 0.4, - "text-offset": [3, 0], - "text-font": [ - "Open Sans Semibold", - "Arial Unicode MS Bold" - ] - } - }, - { - "id": "line", - "type": "line", - "source": "mapbox", - "source-layer": "marine_label", - "paint": { - "line-width": 1 - } - } - ] -} diff --git a/render-test/tests/should-fail.json b/render-test/tests/should-fail.json deleted file mode 100644 index b539d66019..0000000000 --- a/render-test/tests/should-fail.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "tests/file-size/fail-size-is-over": "Should fail, size is bigger than expected.", - "tests/file-size/fail-size-is-under": "Should fail, size is smaller than expected.", - "tests/file-size/fail-file-doesnt-match": "Should fail, doesn't match the expectation.", - "tests/file-size/fail-file-not-found": "Should fail, file not found.", - "tests/network/fail-requests": "Should fail, number of requests higher than expected.", - "tests/network/fail-transferred": "Should fail, amount of transferred data higher than expected.", - "tests/network/fail-requests-transferred": "Should fail, number of requests higher than expected and amount of transferred data less than expected.", - "tests/memory/fail-memory-size-is-too-big": "Should fail, memory size is bigger than expected.", - "tests/memory/fail-memory-size-is-too-small": "Should fail, memory size is smaller than expected.", - "tests/gfx/fail-ib-mem-mismatch": "Should fail, combined byte size of index buffers doesn't match the expectation.", - "tests/gfx/fail-negative-framebuffer-count": "Should fail, number of frame buffers is higher than expected.", - "tests/gfx/fail-texture-mem-mismatch": "Should fail, combined byte size of textures doesn't match the expectation.", - "tests/gfx/fail-too-many-drawcalls": "Should fail, number of draw calls higher than expected.", - "tests/gfx/fail-too-few-buffers": "Should fail, number of vertex and index buffers is smaller than expected.", - "tests/gfx/fail-too-few-textures": "Should fail, number of textures is smaller than expected.", - "tests/gfx/fail-vb-mem-mismatch": "Should fail, combined byte size of index buffers doesn't match the expectation." -} -- cgit v1.2.1