USE_CPP_TEST_SERVER for Linux C++ tests (#1605)

This commit is contained in:
Bart Louwers
2023-09-05 23:01:16 +02:00
committed by GitHub
parent ea543e12f1
commit 9cfb69539b
2 changed files with 8 additions and 6 deletions

View File

@@ -77,7 +77,7 @@ jobs:
CI: 1
run: |
cmake --version
cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Debug -DMLN_WITH_CLANG_TIDY=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMLN_WITH_COVERAGE=ON ${{ env.renderer_flag_cmake }}
CI=1 cmake -B build -GNinja -DCMAKE_BUILD_TYPE=Debug -DMLN_WITH_CLANG_TIDY=ON -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DMLN_WITH_COVERAGE=ON ${{ env.renderer_flag_cmake }}
cmake --build build --target mbgl-core mbgl-test-runner mbgl-render-test-runner mbgl-expression-test
- name: Perform CodeQL Analysis
@@ -125,11 +125,6 @@ jobs:
- run: chmod +x ./mbgl-test-runner
- name: Install npm packages and run test server in background
run: |
npm install
node test/storage/server.js &
- name: Run C++ tests
run: xvfb-run -a ./mbgl-test-runner

View File

@@ -229,3 +229,10 @@ set_property(TARGET mbgl-test PROPERTY FOLDER Core)
if (MLN_WITH_CLANG_TIDY)
set_target_properties(mbgl-test PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND}")
endif()
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
target_compile_definitions(
mbgl-test
PRIVATE USE_CPP_TEST_SERVER
)
endif()