diff options
| author | zmiao <miao.zhao@mapbox.com> | 2019-10-29 20:59:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-29 20:59:29 +0200 |
| commit | c8576e089f12438a2384a4fe822af650e94ace74 (patch) | |
| tree | ad69be13bc00c2dbece7cceedd5007b7532fe173 /next | |
| parent | 84f2ff1084ccaec68c7a26243367ae657f6ebe60 (diff) | |
| download | qtlocation-mapboxgl-c8576e089f12438a2384a4fe822af650e94ace74.tar.gz | |
[render-test] Add manifest parser for render-test-runner (#15861)
* [render-test] Add manifest parser for render-test-runner
* [render-test] Refactory manifest parser
* [render-test] Parse full manifest file through CLI
* [render-test] Add linux probe manifest
Diffstat (limited to 'next')
| -rw-r--r-- | next/platform/linux/linux.cmake | 8 | ||||
| -rw-r--r-- | next/platform/macos/macos.cmake | 15 | ||||
| -rw-r--r-- | next/render-test/CMakeLists.txt | 2 |
3 files changed, 8 insertions, 17 deletions
diff --git a/next/platform/linux/linux.cmake b/next/platform/linux/linux.cmake index 5bde30a61a..396b9a0ffd 100644 --- a/next/platform/linux/linux.cmake +++ b/next/platform/linux/linux.cmake @@ -144,14 +144,12 @@ add_test( render-tests --recycle-map --shuffle - --expectationsPath=render-test/expected/render-tests + --manifestPath=${MBGL_ROOT}/render-test/linux-manifest.json --seed=${MBGL_RENDER_TEST_SEED} - WORKING_DIRECTORY ${MBGL_ROOT} ) add_test( NAME mbgl-render-test-probes - COMMAND mbgl-render-test-runner tests --rootPath=${MBGL_ROOT}/render-test - WORKING_DIRECTORY ${MBGL_ROOT} + 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 WORKING_DIRECTORY ${MBGL_ROOT}) +add_test(NAME mbgl-query-test COMMAND mbgl-render-test-runner query-tests --manifestPath=${MBGL_ROOT}/render-test/linux-manifest.json) diff --git a/next/platform/macos/macos.cmake b/next/platform/macos/macos.cmake index cfabcb1cfa..721d19e625 100644 --- a/next/platform/macos/macos.cmake +++ b/next/platform/macos/macos.cmake @@ -208,19 +208,10 @@ add_test( render-tests --recycle-map --shuffle - --expectationsPath=render-test/expected/render-tests + --manifestPath=${MBGL_ROOT}/render-test/mac-manifest.json --seed=${MBGL_RENDER_TEST_SEED} - WORKING_DIRECTORY ${MBGL_ROOT} ) -add_test( - NAME mbgl-render-test-probes - COMMAND - mbgl-render-test-runner - tests - --rootPath=${MBGL_ROOT}/render-test - --expectationsPath=tests/mac - WORKING_DIRECTORY ${MBGL_ROOT} -) +add_test(NAME mbgl-render-test-probes COMMAND mbgl-render-test-runner tests --manifestPath=${MBGL_ROOT}/render-test/mac-probe-manifest.json) -add_test(NAME mbgl-query-test COMMAND mbgl-render-test-runner query-tests WORKING_DIRECTORY ${MBGL_ROOT}) +add_test(NAME mbgl-query-test COMMAND mbgl-render-test-runner query-tests --manifestPath=${MBGL_ROOT}/render-test/mac-manifest.json) diff --git a/next/render-test/CMakeLists.txt b/next/render-test/CMakeLists.txt index 02ee6141cf..fa4bb0d615 100644 --- a/next/render-test/CMakeLists.txt +++ b/next/render-test/CMakeLists.txt @@ -8,6 +8,8 @@ add_library( ${MBGL_ROOT}/render-test/file_source.hpp ${MBGL_ROOT}/render-test/filesystem.hpp ${MBGL_ROOT}/render-test/include/mbgl/render_test.hpp + ${MBGL_ROOT}/render-test/manifest_parser.cpp + ${MBGL_ROOT}/render-test/manifest_parser.hpp ${MBGL_ROOT}/render-test/metadata.hpp ${MBGL_ROOT}/render-test/parser.cpp ${MBGL_ROOT}/render-test/parser.hpp |