Skip to content

Commit 9cfb695

Browse files
authored
USE_CPP_TEST_SERVER for Linux C++ tests (#1605)
1 parent ea543e1 commit 9cfb695

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

.github/workflows/linux-ci.yml

+1-6
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
CI: 1
7878
run: |
7979
cmake --version
80-
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 }}
80+
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 }}
8181
cmake --build build --target mbgl-core mbgl-test-runner mbgl-render-test-runner mbgl-expression-test
8282
8383
- name: Perform CodeQL Analysis
@@ -125,11 +125,6 @@ jobs:
125125

126126
- run: chmod +x ./mbgl-test-runner
127127

128-
- name: Install npm packages and run test server in background
129-
run: |
130-
npm install
131-
node test/storage/server.js &
132-
133128
- name: Run C++ tests
134129
run: xvfb-run -a ./mbgl-test-runner
135130

test/CMakeLists.txt

+7
Original file line numberDiff line numberDiff line change
@@ -229,3 +229,10 @@ set_property(TARGET mbgl-test PROPERTY FOLDER Core)
229229
if (MLN_WITH_CLANG_TIDY)
230230
set_target_properties(mbgl-test PROPERTIES CXX_CLANG_TIDY "${CLANG_TIDY_COMMAND}")
231231
endif()
232+
233+
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
234+
target_compile_definitions(
235+
mbgl-test
236+
PRIVATE USE_CPP_TEST_SERVER
237+
)
238+
endif()

0 commit comments

Comments
 (0)