Skip to content

Commit dc08ec4

Browse files
committed
Try using CAPTURE_CMAKE_ERROR to work around CI test failures.
1 parent 8717b58 commit dc08ec4

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

.ci.cmake

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ endif()
2626
ctest_build(TARGET _dl)
2727
ctest_build(TARGET _sl)
2828
set(retval 0)
29+
set(retval_cmake 0)
2930
if(NOT CTEST_DISABLE_TESTING)
3031
# shared_fs_mutex takes too long on CI
3132
# tls_socket_handle is unstable
@@ -34,15 +35,15 @@ if(NOT CTEST_DISABLE_TESTING)
3435
if(WIN32)
3536
# Azure's Windows version doesn't permit unprivileged creation of symbolic links
3637
if(CTEST_CMAKE_GENERATOR MATCHES "Visual Studio 15 2017.*")
37-
ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink|process_handle")
38+
ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink|process_handle")
3839
else()
39-
ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink")
40+
ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}|symlink")
4041
endif()
4142
elseif(APPLE)
4243
# Around Feb 2021 the Mac OS CI began failing pipe_handle and I don't have a Mac to diagnose
43-
ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}|pipe_handle")
44+
ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}|pipe_handle")
4445
else()
45-
ctest_test(RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS}")
46+
ctest_test(RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS}")
4647
endif()
4748
endif()
4849
if(WIN32)
@@ -183,18 +184,20 @@ else()
183184
endif()
184185
set(retval2 0)
185186
set(retval3 0)
187+
set(retval2_cmake 0)
188+
set(retval3_cmake 0)
186189
if(NOT CTEST_DISABLE_TESTING)
187190
if(("$ENV{CXX}" MATCHES "clang") OR ("$ENV{CXX}" MATCHES "g\\+\\+"))
188191
if("$ENV{CXX}" MATCHES "clang")
189192
ctest_build(TARGET _sl-asan)
190193
set(CTEST_CONFIGURATION_TYPE "asan")
191-
ctest_test(RETURN_VALUE retval2 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
194+
ctest_test(RETURN_VALUE retval2 CAPTURE_CMAKE_ERROR retval2_cmake INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
192195
else()
193196
set(retval2 0)
194197
endif()
195198
ctest_build(TARGET _sl-ubsan)
196199
set(CTEST_CONFIGURATION_TYPE "ubsan")
197-
ctest_test(RETURN_VALUE retval3 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
200+
ctest_test(RETURN_VALUE retval3 CAPTURE_CMAKE_ERROR retval3_cmake INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex")
198201
endif()
199202
merge_junit_results_into_ctest_xml()
200203
endif()
@@ -203,7 +206,7 @@ if(EXISTS "${toupload}")
203206
endif()
204207
ctest_submit()
205208
if(NOT retval EQUAL 0 OR NOT retval2 EQUAL 0 OR NOT retval3 EQUAL 0)
206-
message(FATAL_ERROR "FATAL: Running tests exited with ${retval} ${retval2} ${retval3}")
209+
message(FATAL_ERROR "FATAL: Running tests exited with ${retval}-${retval_cmake} ${retval2}-${retval2_cmake} ${retval3}-${retval3_cmake}")
207210
else()
208-
message(STATUS "SUCCESS: Running tests exited with ${retval} ${retval2} ${retval3}")
211+
message(STATUS "SUCCESS: Running tests exited with ${retval}-${retval_cmake} ${retval2}-${retval2_cmake} ${retval3}-${retval3_cmake}")
209212
endif()

0 commit comments

Comments
 (0)