Linux CI: Retry failed XOpenDisplay calls and only log errors in coverage run (#1368)
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com> Co-authored-by: Bart Louwers <bart@emeel.net> Co-authored-by: Bart Louwers <bart.louwers@gmail.com>
This commit is contained in:
@@ -93,6 +93,15 @@ else()
|
||||
)
|
||||
endif()
|
||||
|
||||
if (DEFINED ENV{CI})
|
||||
message("Building for CI")
|
||||
target_compile_definitions(
|
||||
mbgl-core
|
||||
PRIVATE
|
||||
CI_BUILD=1
|
||||
)
|
||||
endif()
|
||||
|
||||
# FIXME: Should not be needed, but now needed by node because of the headless frontend.
|
||||
target_include_directories(
|
||||
mbgl-core
|
||||
@@ -153,9 +162,19 @@ add_executable(
|
||||
|
||||
target_compile_definitions(
|
||||
mbgl-test-runner
|
||||
PRIVATE WORK_DIRECTORY=${PROJECT_SOURCE_DIR}
|
||||
PRIVATE
|
||||
WORK_DIRECTORY=${PROJECT_SOURCE_DIR}
|
||||
)
|
||||
|
||||
if (DEFINED ENV{CI})
|
||||
message("Building for CI")
|
||||
target_compile_definitions(
|
||||
mbgl-test-runner
|
||||
PRIVATE
|
||||
CI_BUILD=1
|
||||
)
|
||||
endif()
|
||||
|
||||
target_link_libraries(
|
||||
mbgl-test-runner
|
||||
PRIVATE
|
||||
|
||||
Reference in New Issue
Block a user