diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-09-12 16:03:42 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-09-12 16:03:42 +0300 |
| commit | efc3c6d35cf9b877bf16ba996f5d4e67b4be6354 (patch) | |
| tree | d5f1f9933aedc8428c8ae8c9857506b4d9372fba /.ci.cmake | |
| parent | 694c2bfc5a99df718f3848c3f6f7fc95e7f4fe8c (diff) | |
Fix ARM Travis CI trying to test ubsan.
Diffstat (limited to '.ci.cmake')
| -rw-r--r-- | .ci.cmake | 24 |
1 files changed, 13 insertions, 11 deletions
@@ -95,19 +95,21 @@ else() endif() set(retval2 0) set(retval3 0) -if(("$ENV{CXX}" MATCHES "clang") OR ("$ENV{CXX}" MATCHES "g\\+\\+")) - if("$ENV{CXX}" MATCHES "clang") - ctest_build(TARGET _sl-asan) - set(CTEST_CONFIGURATION_TYPE "asan") - ctest_test(RETURN_VALUE retval2 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex") - else() - set(retval2 0) +if(NOT CTEST_DISABLE_TESTING) + if(("$ENV{CXX}" MATCHES "clang") OR ("$ENV{CXX}" MATCHES "g\\+\\+")) + if("$ENV{CXX}" MATCHES "clang") + ctest_build(TARGET _sl-asan) + set(CTEST_CONFIGURATION_TYPE "asan") + ctest_test(RETURN_VALUE retval2 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex") + else() + set(retval2 0) + endif() + ctest_build(TARGET _sl-ubsan) + set(CTEST_CONFIGURATION_TYPE "ubsan") + ctest_test(RETURN_VALUE retval3 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex") endif() - ctest_build(TARGET _sl-ubsan) - set(CTEST_CONFIGURATION_TYPE "ubsan") - ctest_test(RETURN_VALUE retval3 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex") + merge_junit_results_into_ctest_xml() endif() -merge_junit_results_into_ctest_xml() if(EXISTS "${toupload}") ctest_upload(FILES "${toupload}") endif() |