Skip to content

Commit 08920fb

Browse files
[CMake] Fix #191.
Correctly invoke the updated `IntegrationTest.py` script by using option `--builddir`.
1 parent ca5206c commit 08920fb

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.gitlab-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ integrationtest:linux-amd64:
232232
artifacts: true
233233
script:
234234
- pipenv --python $PYTHON_VERSION sync
235-
- env UBSAN_OPTIONS=print_stacktrace=1 ASAN_OPTIONS=detect_stack_use_after_return=1 --unset=TERM pipenv run test/IntegrationTest.py --required-only --debug build/debug
235+
- env UBSAN_OPTIONS=print_stacktrace=1 ASAN_OPTIONS=detect_stack_use_after_return=1 --unset=TERM pipenv run test/IntegrationTest.py --required-only --debug --builddir build/debug
236236

237237
integrationtest:macos-amd64:
238238
stage: test:debug
@@ -244,7 +244,7 @@ integrationtest:macos-amd64:
244244
artifacts: true
245245
script:
246246
- pipenv --python $PYTHON_VERSION sync
247-
- env UBSAN_OPTIONS=print_stacktrace=1 ASAN_OPTIONS=detect_stack_use_after_return=1:detect_container_overflow=0 MallocNanoZone=0 --unset=TERM pipenv run test/IntegrationTest.py --required-only --debug build/debug
247+
- env UBSAN_OPTIONS=print_stacktrace=1 ASAN_OPTIONS=detect_stack_use_after_return=1:detect_container_overflow=0 MallocNanoZone=0 --unset=TERM pipenv run test/IntegrationTest.py --required-only --debug --builddir build/debug
248248

249249
ensure-exported-symbols:debug:linux:
250250
stage: test:debug

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
295295
COMMAND echo "#########################"
296296
COMMAND echo "### Integration Tests ###"
297297
COMMAND echo "#########################"
298-
COMMAND env ${env} pipenv run "${CMAKE_CURRENT_SOURCE_DIR}/test/IntegrationTest.py" -r "${PROJECT_BINARY_DIR}"
298+
COMMAND env ${env} pipenv run "${CMAKE_CURRENT_SOURCE_DIR}/test/IntegrationTest.py" -r --builddir "${PROJECT_BINARY_DIR}"
299299
)
300300

301301
# Target `check` runs unit and integration tests, in that order

0 commit comments

Comments
 (0)