diff options
| -rw-r--r-- | .ci.cmake | 2 | ||||
| -rw-r--r-- | .travis.yml | 28 |
2 files changed, 15 insertions, 15 deletions
@@ -100,7 +100,7 @@ else() endif() set(retval2 0) set(retval3 0) -if(NOT CTEST_DISABLE_TESTING AND NOT APPLE) # Recent XCode has a parse bug for asan and ubsan +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) diff --git a/.travis.yml b/.travis.yml index f8ef5bfb..ab92e794 100644 --- a/.travis.yml +++ b/.travis.yml @@ -70,13 +70,13 @@ matrix: env: - NAME=x64_SC_tests - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-libc++.cmake - - name: "Xcode 11.6 x64 cmake tests (status_code)" - compiler: clang++ - os: osx - osx_image: xcode11.6 - env: - - NAME=x64_SC_tests - - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON +# - name: "Xcode 11.6 x64 cmake tests (status_code)" +# compiler: clang++ +# os: osx +# osx_image: xcode11.6 +# env: +# - NAME=x64_SC_tests +# - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - name: "g++ ARM32 cmake build (error_code)" compiler: g++ os: linux @@ -155,13 +155,13 @@ matrix: env: - NAME=x64_SC_install - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON -DCMAKE_TOOLCHAIN_FILE=../cmake/toolchain-linux-libc++.cmake - - name: "Xcode 11.6 Installability (status_code)" - compiler: clang++ - os: osx - osx_image: xcode11.6 - env: - - NAME=x64_SC_install - - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON +# - name: "Xcode 11.6 Installability (status_code)" +# compiler: clang++ +# os: osx +# osx_image: xcode11.6 +# env: +# - NAME=x64_SC_install +# - CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON before_install: - if [ "$TRAVIS_COMPILER" = "clang++-10" ]; then |