diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-10-13 03:25:07 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2019-10-13 03:25:07 +0300 |
| commit | feb0a4bd164d2e7a0bf570d14f2a6421d4aa8d3a (patch) | |
| tree | b52c93b5088e09ca624f01c817fa1115a309f566 | |
| parent | 17999ded479adfc2fb6417d0bb620259293377a0 (diff) | |
Disable coroutines testing on travis entirely, it doesn't have the required libs
| -rw-r--r-- | .ci.cmake | 2 | ||||
| -rw-r--r-- | .travis.yml | 12 |
2 files changed, 6 insertions, 8 deletions
@@ -5,7 +5,7 @@ include(cmake/QuickCppLibBootstrap.cmake) include(QuickCppLibUtils) CONFIGURE_CTEST_SCRIPT_FOR_CDASH("llfio" "prebuilt") -list(APPEND CTEST_CONFIGURE_OPTIONS -DCMAKE_BUILD_TYPE=${CTEST_CONFIGURATION_TYPE}) +list(APPEND CTEST_CONFIGURE_OPTIONS -DCMAKE_BUILD_TYPE=${CTEST_CONFIGURATION_TYPE} -DCXX_COROUTINES_FLAGS=) ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY}) include(FindGit) set(CTEST_GIT_COMMAND "${GIT_EXECUTABLE}") diff --git a/.travis.yml b/.travis.yml index 20a3aed5..bec3c223 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ dist: bionic language: cpp compiler: - g++ - - clang++-8 + - clang++ sudo: false os: - linux @@ -20,9 +20,7 @@ addons: apt: packages: - g++ - - clang-8 - - libc++-8-dev - - libc++abi-8-dev + - clang - g++-arm-linux-gnueabihf - python3 - cmake @@ -52,10 +50,10 @@ matrix: # - os: osx # env: __="cmake tests (status_code)" NAME=TravisLinuxWorkerSC CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - os: linux - compiler: clang++-8 + compiler: clang++ env: __="ARM32 cmake tests (error_code)" NAME=Linux_ARM32_EC CMAKE_CONFIGURE_OPTIONS= - os: linux - compiler: clang++-8 + compiler: clang++ env: __="ARM32 cmake tests (status_code)" NAME=Linux_ARM32_SC CMAKE_CONFIGURE_OPTIONS=-DLLFIO_USE_EXPERIMENTAL_SG14_STATUS_CODE=ON - os: linux compiler: g++ @@ -76,7 +74,7 @@ before_install: export CMAKE_CONFIGURE_OPTIONS="$CMAKE_CONFIGURE_OPTIONS -DCMAKE_LIBRARY_PATH=/usr/local/opt/llvm/lib"; fi - if [ "$CXX" = "g++" ]; then export NAME=GCC$NAME; fi; - - if [ "$CXX" = "clang++-8" ]; then export NAME=Clang$NAME; fi; + - if [ "$CXX" = "clang++" ]; then export NAME=Clang$NAME; fi; - git checkout develop - git submodule update --init --recursive - mount |