diff options
author | zmiao <miao.zhao@mapbox.com> | 2019-10-15 19:16:32 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-15 19:16:32 +0300 |
commit | e829d1ae6f01ff3c336cd429dacd98aeb3b7162a (patch) | |
tree | bad1b0bb1f46a820213cbe08cb40b56fd91d9389 /next | |
parent | 0f9666ebf3614dcc50e6a60c3c84bb578986bcf7 (diff) | |
download | qtlocation-mapboxgl-e829d1ae6f01ff3c336cd429dacd98aeb3b7162a.tar.gz |
[test-runner] make render-test a shared lib (#15816)
* [test-runner] make render-test a shared lib
[test-runner] nit
[test-runner] nit again
* [test-runner] Remove redundant linked file in cmake
Diffstat (limited to 'next')
-rw-r--r-- | next/CMakeLists.txt | 1 | ||||
-rw-r--r-- | next/platform/linux/linux.cmake | 27 | ||||
-rw-r--r-- | next/platform/macos/macos.cmake | 28 | ||||
-rw-r--r-- | next/render-test/CMakeLists.txt | 37 |
4 files changed, 70 insertions, 23 deletions
diff --git a/next/CMakeLists.txt b/next/CMakeLists.txt index df56f04b22..fb0779bea4 100644 --- a/next/CMakeLists.txt +++ b/next/CMakeLists.txt @@ -943,3 +943,4 @@ endif() add_subdirectory(${PROJECT_SOURCE_DIR}/test) add_subdirectory(${PROJECT_SOURCE_DIR}/benchmark) +add_subdirectory(${PROJECT_SOURCE_DIR}/render-test) diff --git a/next/platform/linux/linux.cmake b/next/platform/linux/linux.cmake index 18531a2856..be905c204f 100644 --- a/next/platform/linux/linux.cmake +++ b/next/platform/linux/linux.cmake @@ -95,7 +95,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/bin) add_subdirectory(${PROJECT_SOURCE_DIR}/expression-test) add_subdirectory(${PROJECT_SOURCE_DIR}/platform/glfw) add_subdirectory(${PROJECT_SOURCE_DIR}/platform/node) -add_subdirectory(${PROJECT_SOURCE_DIR}/render-test) add_executable( mbgl-test-runner @@ -122,5 +121,31 @@ target_link_libraries( PRIVATE mbgl-benchmark ) +add_executable( + mbgl-render-test-runner + ${MBGL_ROOT}/platform/default/src/mbgl/render-test/main.cpp +) + +target_link_libraries( + mbgl-render-test-runner + PRIVATE mbgl-render-test +) + add_test(NAME mbgl-benchmark-runner COMMAND mbgl-benchmark-runner WORKING_DIRECTORY ${MBGL_ROOT}) add_test(NAME mbgl-test-runner COMMAND mbgl-test-runner WORKING_DIRECTORY ${MBGL_ROOT}) + +string(RANDOM LENGTH 5 ALPHABET 0123456789 MBGL_RENDER_TEST_SEED) + +add_test( + NAME mbgl-render-test + COMMAND + mbgl-render-test-runner + render-tests + --recycle-map + --shuffle + --seed=${MBGL_RENDER_TEST_SEED} + WORKING_DIRECTORY ${MBGL_ROOT} +) + +add_test(NAME mbgl-render-test-probes COMMAND mbgl-render-test-runner tests --rootPath=render-test WORKING_DIRECTORY ${MBGL_ROOT}) +add_test(NAME mbgl-query-test COMMAND mbgl-render-test-runner query-tests WORKING_DIRECTORY ${MBGL_ROOT}) diff --git a/next/platform/macos/macos.cmake b/next/platform/macos/macos.cmake index a0dcb9a829..cbe386a1ac 100644 --- a/next/platform/macos/macos.cmake +++ b/next/platform/macos/macos.cmake @@ -155,7 +155,6 @@ add_subdirectory(${PROJECT_SOURCE_DIR}/bin) add_subdirectory(${PROJECT_SOURCE_DIR}/expression-test) add_subdirectory(${PROJECT_SOURCE_DIR}/platform/glfw) add_subdirectory(${PROJECT_SOURCE_DIR}/platform/node) -add_subdirectory(${PROJECT_SOURCE_DIR}/render-test) add_executable( mbgl-test-runner @@ -182,8 +181,35 @@ target_link_libraries( PRIVATE mbgl-benchmark ) +add_executable( + mbgl-render-test-runner + ${MBGL_ROOT}/platform/default/src/mbgl/render-test/main.cpp +) + +target_link_libraries( + mbgl-render-test-runner + PRIVATE mbgl-render-test +) + set_property(TARGET mbgl-benchmark-runner PROPERTY FOLDER Executables) set_property(TARGET mbgl-test-runner PROPERTY FOLDER Executables) +set_property(TARGET mbgl-render-test-runner PROPERTY FOLDER Executables) add_test(NAME mbgl-benchmark-runner COMMAND mbgl-benchmark-runner WORKING_DIRECTORY ${MBGL_ROOT}) add_test(NAME mbgl-test-runner COMMAND mbgl-test-runner WORKING_DIRECTORY ${MBGL_ROOT}) + +string(RANDOM LENGTH 5 ALPHABET 0123456789 MBGL_RENDER_TEST_SEED) + +add_test( + NAME mbgl-render-test + COMMAND + mbgl-render-test-runner + render-tests + --recycle-map + --shuffle + --seed=${MBGL_RENDER_TEST_SEED} + WORKING_DIRECTORY ${MBGL_ROOT} +) + +add_test(NAME mbgl-render-test-probes COMMAND mbgl-render-test-runner tests --rootPath=render-test WORKING_DIRECTORY ${MBGL_ROOT}) +add_test(NAME mbgl-query-test COMMAND mbgl-render-test-runner query-tests WORKING_DIRECTORY ${MBGL_ROOT}) diff --git a/next/render-test/CMakeLists.txt b/next/render-test/CMakeLists.txt index 1a4cd5ceb6..2e1c5438ed 100644 --- a/next/render-test/CMakeLists.txt +++ b/next/render-test/CMakeLists.txt @@ -1,16 +1,18 @@ -add_executable( - mbgl-render-test +add_library( + mbgl-render-test SHARED EXCLUDE_FROM_ALL + ${MBGL_ROOT}/expression-test/test_runner_common.cpp + ${MBGL_ROOT}/expression-test/test_runner_common.hpp ${MBGL_ROOT}/render-test/allocation_index.cpp ${MBGL_ROOT}/render-test/allocation_index.hpp ${MBGL_ROOT}/render-test/filesystem.hpp - ${MBGL_ROOT}/render-test/main.cpp + ${MBGL_ROOT}/render-test/filesystem.hpp + ${MBGL_ROOT}/render-test/include/mbgl/render_test.hpp ${MBGL_ROOT}/render-test/metadata.hpp ${MBGL_ROOT}/render-test/parser.cpp ${MBGL_ROOT}/render-test/parser.hpp + ${MBGL_ROOT}/render-test/render_test.cpp ${MBGL_ROOT}/render-test/runner.cpp ${MBGL_ROOT}/render-test/runner.hpp - ${MBGL_ROOT}/expression-test/test_runner_common.cpp - ${MBGL_ROOT}/expression-test/test_runner_common.hpp ) target_compile_definitions( @@ -24,6 +26,11 @@ target_include_directories( PRIVATE ${MBGL_ROOT}/src ) +target_include_directories( + mbgl-render-test + PUBLIC ${MBGL_ROOT}/render-test/include ${MBGL_ROOT}/include +) + include(${PROJECT_SOURCE_DIR}/vendor/boost.cmake) target_link_libraries( @@ -36,20 +43,8 @@ target_link_libraries( mbgl-vendor-boost ) -set_property(TARGET mbgl-render-test PROPERTY FOLDER Executables) - -string(RANDOM LENGTH 5 ALPHABET 0123456789 MBGL_RENDER_TEST_SEED) - -add_test( - NAME mbgl-render-test - COMMAND - mbgl-render-test - render-tests - --recycle-map - --shuffle - --seed=${MBGL_RENDER_TEST_SEED} - WORKING_DIRECTORY ${MBGL_ROOT} -) +if(CMAKE_SYSTEM_NAME STREQUAL Android) + set_target_properties(mbgl-render-test PROPERTIES LINK_FLAGS_RELEASE "-fuse-ld=gold -O2 -flto -Wl,--icf=safe") +endif() -add_test(NAME mbgl-render-test-probes COMMAND mbgl-render-test tests --rootPath=render-test WORKING_DIRECTORY ${MBGL_ROOT}) -add_test(NAME mbgl-query-test COMMAND mbgl-render-test query-tests WORKING_DIRECTORY ${MBGL_ROOT}) +set_property(TARGET mbgl-render-test PROPERTY FOLDER Core) |