1 files changed, 16 insertions, 21 deletions
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)