@@ -26,6 +26,7 @@ endif()
26
26
ctest_build (TARGET _dl )
27
27
ctest_build (TARGET _sl )
28
28
set (retval 0 )
29
+ set (retval_cmake 0 )
29
30
if (NOT CTEST_DISABLE_TESTING )
30
31
# shared_fs_mutex takes too long on CI
31
32
# tls_socket_handle is unstable
@@ -34,15 +35,15 @@ if(NOT CTEST_DISABLE_TESTING)
34
35
if (WIN32 )
35
36
# Azure's Windows version doesn't permit unprivileged creation of symbolic links
36
37
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" )
38
39
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" )
40
41
endif ()
41
42
elseif (APPLE )
42
43
# 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" )
44
45
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} " )
46
47
endif ()
47
48
endif ()
48
49
if (WIN32 )
@@ -183,18 +184,20 @@ else()
183
184
endif ()
184
185
set (retval2 0 )
185
186
set (retval3 0 )
187
+ set (retval2_cmake 0 )
188
+ set (retval3_cmake 0 )
186
189
if (NOT CTEST_DISABLE_TESTING )
187
190
if (("$ENV{CXX} " MATCHES "clang" ) OR ("$ENV{CXX} " MATCHES "g\\ +\\ +" ))
188
191
if ("$ENV{CXX} " MATCHES "clang" )
189
192
ctest_build (TARGET _sl-asan )
190
193
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" )
192
195
else ()
193
196
set (retval2 0 )
194
197
endif ()
195
198
ctest_build (TARGET _sl-ubsan )
196
199
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" )
198
201
endif ()
199
202
merge_junit_results_into_ctest_xml ()
200
203
endif ()
@@ -203,7 +206,7 @@ if(EXISTS "${toupload}")
203
206
endif ()
204
207
ctest_submit ()
205
208
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 } " )
207
210
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 } " )
209
212
endif ()
0 commit comments