diff options
| -rw-r--r-- | next/platform/linux/linux.cmake | 26 | ||||
| -rw-r--r-- | render-test/linux-manifest-probe-gfx-network.json | 9 | ||||
| -rw-r--r-- | render-test/linux-manifest-probe-memory.json | 9 | ||||
| -rw-r--r-- | render-test/linux-probe-manifest.json | 2 | ||||
| -rw-r--r-- | render-test/linux-query-manifest.json | 6 |
5 files changed, 46 insertions, 6 deletions
diff --git a/next/platform/linux/linux.cmake b/next/platform/linux/linux.cmake index 52aba6ea95..39777c93f6 100644 --- a/next/platform/linux/linux.cmake +++ b/next/platform/linux/linux.cmake @@ -135,8 +135,24 @@ add_test( --seed=${MBGL_RENDER_TEST_SEED} ) -add_test( - NAME mbgl-render-test-probes - COMMAND mbgl-render-test-runner tests --manifestPath=${MBGL_ROOT}/render-test/linux-probe-manifest.json -) -add_test(NAME mbgl-query-test COMMAND mbgl-render-test-runner query-tests --manifestPath=${MBGL_ROOT}/render-test/linux-manifest.json) +if(CMAKE_C_COMPILER MATCHES clang OR CMAKE_BUILD_TYPE MATCHES Debug) + add_test( + NAME mbgl-render-test-probe-unit-tests + COMMAND mbgl-render-test-runner tests --manifestPath=${MBGL_ROOT}/render-test/linux-probe-manifest.json + ) +else() + add_test( + NAME mbgl-render-test-probe-gfx-network + COMMAND mbgl-render-test-runner render-tests --manifestPath=${MBGL_ROOT}/render-test/linux-manifest-probe-gfx-network.json + ) + add_test( + NAME mbgl-render-test-probe-memory + COMMAND + mbgl-render-test-runner + render-tests + --manifestPath=${MBGL_ROOT}/render-test/linux-manifest-probe-memory.json + --filter=real-world + ) +endif() + +add_test(NAME mbgl-query-test COMMAND mbgl-render-test-runner query-tests --manifestPath=${MBGL_ROOT}/render-test/linux-query-manifest.json) diff --git a/render-test/linux-manifest-probe-gfx-network.json b/render-test/linux-manifest-probe-gfx-network.json new file mode 100644 index 0000000000..b63013ca18 --- /dev/null +++ b/render-test/linux-manifest-probe-gfx-network.json @@ -0,0 +1,9 @@ +{ + "base_test_path":"../mapbox-gl-js/test/integration", + "expectation_paths":["expected/"], + "ignore_paths":["../platform/node/test/ignores.json", "../render-test/linux-ignores.json"], + "vendor_path":"../vendor", + "asset_path": "../mapbox-gl-js/test/integration", + "probes": ["probeGFX", "probeNetwork"], + "metric_path":"metrics/linux-gcc8" +}
\ No newline at end of file diff --git a/render-test/linux-manifest-probe-memory.json b/render-test/linux-manifest-probe-memory.json new file mode 100644 index 0000000000..1f9fa1ca5c --- /dev/null +++ b/render-test/linux-manifest-probe-memory.json @@ -0,0 +1,9 @@ +{ + "base_test_path":"../mapbox-gl-js/test/integration", + "expectation_paths":["expected/"], + "ignore_paths":["../platform/node/test/ignores.json", "../render-test/linux-ignores.json"], + "vendor_path":"../vendor", + "asset_path": "../mapbox-gl-js/test/integration", + "probes": ["probeMemory"], + "metric_path":"metrics/linux-gcc8" +}
\ No newline at end of file diff --git a/render-test/linux-probe-manifest.json b/render-test/linux-probe-manifest.json index 0b2ca88988..f0ebeedd10 100644 --- a/render-test/linux-probe-manifest.json +++ b/render-test/linux-probe-manifest.json @@ -1,7 +1,7 @@ { "probe_test_path":".", "expectation_paths":["expected/render-tests"], - "ignore_paths":["../render-test/linux-ignores.json", "../render-test/tests/should-fail.json"], + "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 new file mode 100644 index 0000000000..a6723f5519 --- /dev/null +++ b/render-test/linux-query-manifest.json @@ -0,0 +1,6 @@ +{ + "base_test_path":"../mapbox-gl-js/test/integration", + "ignore_paths":["../platform/node/test/ignores.json", "../render-test/linux-ignores.json"], + "vendor_path":"../vendor", + "asset_path": "../mapbox-gl-js/test/integration" +}
\ No newline at end of file |