diff options
| author | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2020-06-21 20:10:22 +0300 |
|---|---|---|
| committer | Niall Douglas (s [underscore] sourceforge {at} nedprod [dot] com) <spamtrap@nedprod.com> | 2020-06-21 20:10:22 +0300 |
| commit | 19f3d897d143791f40b1cdcf615336373df4617b (patch) | |
| tree | dbb83ceda0dfba3b1c62bd1720f7e7bcfbde402a | |
| parent | 84205c952cd4a3dee4a0e329b454be4cfe364fdb (diff) | |
More CI fixes.
| -rw-r--r-- | .ci.cmake | 10 | ||||
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | programs/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | test/tests/traverse.cpp | 4 |
4 files changed, 12 insertions, 7 deletions
@@ -109,9 +109,13 @@ if(NOT CTEST_DISABLE_TESTING) 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") + if(NOT APPLE) # I get weird build errors on Xcode + ctest_build(TARGET _sl-ubsan) + set(CTEST_CONFIGURATION_TYPE "ubsan") + ctest_test(RETURN_VALUE retval3 INCLUDE "llfio_sl" EXCLUDE "shared_fs_mutex") + else() + set(retval3 0) + endif() endif() merge_junit_results_into_ctest_xml() endif() diff --git a/.travis.yml b/.travis.yml index 985192e3..f8ef5bfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -220,7 +220,7 @@ script: if [[ "$NAME" == "x64_"*"_install" ]]; then git clone --depth 1 https://github.com/ned14/quickcpplib.git; pip3 install --user gitpython; - python3 quickcpplib/scripts/test_cpp-pm_install.py test-packaging/example.cpp quickcpplib quickcpplib::hl https://github.com/ned14/quickcpplib outcome outcome::hl https://github.com/ned14/outcome llfio llfio::sl https://github.com/ned14/llfio; + python3 quickcpplib/scripts/test_cpp-pm_install.py test-packaging/example.cpp quickcpplib quickcpplib::hl https://github.com/ned14/quickcpplib master outcome outcome::hl https://github.com/ned14/outcome better_optimisation llfio llfio::sl https://github.com/ned14/llfio master; cd test_cpp-pm_install; mkdir build; cd build; diff --git a/programs/CMakeLists.txt b/programs/CMakeLists.txt index 3182141d..07db5753 100644 --- a/programs/CMakeLists.txt +++ b/programs/CMakeLists.txt @@ -11,7 +11,8 @@ find_quickcpplib_library(quickcpplib ) find_quickcpplib_library(outcome GIT_REPOSITORY "https://github.com/ned14/outcome.git" - GIT_TAG "develop" +# GIT_TAG "develop" + GIT_TAG "better_optimisation" ## future Outcome v2.2 REQUIRED IS_HEADER_ONLY ) diff --git a/test/tests/traverse.cpp b/test/tests/traverse.cpp index 7551d5f8..a019ff3f 100644 --- a/test/tests/traverse.cpp +++ b/test/tests/traverse.cpp @@ -37,9 +37,9 @@ static inline void TestTraverse() { using namespace LLFIO_V2_NAMESPACE; #ifdef _WIN32 - static constexpr path_view to_traverse_path("c:\\"); + static constexpr path_view to_traverse_path("c:\\windows"); #else - static constexpr path_view to_traverse_path("/"); + static constexpr path_view to_traverse_path("/usr"); #endif auto to_traverse = path_handle::path(to_traverse_path).value(); struct my_traverse_visitor final : algorithm::traverse_visitor |