@@ -26,7 +26,6 @@ endif()
26
26
ctest_build (TARGET _dl )
27
27
ctest_build (TARGET _sl )
28
28
set (retval 0 )
29
- set (retval_cmake 0 )
30
29
if (NOT CTEST_DISABLE_TESTING )
31
30
# shared_fs_mutex takes too long on CI
32
31
# tls_socket_handle is unstable
@@ -35,15 +34,15 @@ if(NOT CTEST_DISABLE_TESTING)
35
34
if (WIN32 )
36
35
# Azure's Windows version doesn't permit unprivileged creation of symbolic links
37
36
if (CTEST_CMAKE_GENERATOR MATCHES "Visual Studio 15 2017.*" )
38
- ctest_test (RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS} |symlink|process_handle" )
37
+ ctest_test (RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS} |symlink|process_handle" )
39
38
else ()
40
- ctest_test (RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS} |symlink" )
39
+ ctest_test (RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS} |symlink" )
41
40
endif ()
42
41
elseif (APPLE )
43
42
# Around Feb 2021 the Mac OS CI began failing pipe_handle and I don't have a Mac to diagnose
44
- ctest_test (RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS} |pipe_handle" )
43
+ ctest_test (RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS} |pipe_handle" )
45
44
else ()
46
- ctest_test (RETURN_VALUE retval CAPTURE_CMAKE_ERROR retval_cmake EXCLUDE "${LLFIO_DISABLE_TESTS} " )
45
+ ctest_test (RETURN_VALUE retval EXCLUDE "${LLFIO_DISABLE_TESTS} " )
47
46
endif ()
48
47
endif ()
49
48
if (WIN32 )
@@ -184,20 +183,18 @@ else()
184
183
endif ()
185
184
set (retval2 0 )
186
185
set (retval3 0 )
187
- set (retval2_cmake 0 )
188
- set (retval3_cmake 0 )
189
186
if (NOT CTEST_DISABLE_TESTING )
190
187
if (("$ENV{CXX} " MATCHES "clang" ) OR ("$ENV{CXX} " MATCHES "g\\ +\\ +" ))
191
188
if ("$ENV{CXX} " MATCHES "clang" )
192
189
ctest_build (TARGET _sl-asan )
193
190
set (CTEST_CONFIGURATION_TYPE "asan" )
194
- ctest_test (RETURN_VALUE retval2 CAPTURE_CMAKE_ERROR retval2_cmake INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex" )
191
+ ctest_test (RETURN_VALUE retval2 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex" )
195
192
else ()
196
193
set (retval2 0 )
197
194
endif ()
198
195
ctest_build (TARGET _sl-ubsan )
199
196
set (CTEST_CONFIGURATION_TYPE "ubsan" )
200
- ctest_test (RETURN_VALUE retval3 CAPTURE_CMAKE_ERROR retval3_cmake INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex" )
197
+ ctest_test (RETURN_VALUE retval3 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex" )
201
198
endif ()
202
199
merge_junit_results_into_ctest_xml ()
203
200
endif ()
@@ -206,7 +203,7 @@ if(EXISTS "${toupload}")
206
203
endif ()
207
204
ctest_submit ()
208
205
if (NOT retval EQUAL 0 OR NOT retval2 EQUAL 0 OR NOT retval3 EQUAL 0 )
209
- message (FATAL_ERROR "FATAL: Running tests exited with ${retval} - ${retval_cmake} ${retval2} - ${retval2_cmake} ${retval3} - ${retval3_cmake } " )
206
+ message (FATAL_ERROR "FATAL: Running tests exited with ${retval} ${retval2} ${retval3} " )
210
207
else ()
211
- message (STATUS "SUCCESS: Running tests exited with ${retval} - ${retval_cmake} ${retval2} - ${retval2_cmake} ${retval3} - ${retval3_cmake } " )
208
+ message (STATUS "SUCCESS: Running tests exited with ${retval} ${retval2} ${retval3} " )
212
209
endif ()
0 commit comments