From f29dd973c26137c126f180c14f3bb5a4b76d2ed8 Mon Sep 17 00:00:00 2001 From: Steffen Schuemann Date: Sun, 24 Nov 2019 11:54:54 +0100 Subject: [PATCH] work on CI configuration. --- .appveyor.yml | 1 + .travis.yml | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index 5cf09e1..9680e4a 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -65,5 +65,6 @@ test_script: - cd %APPVEYOR_BUILD_FOLDER%\build - set CTEST_OUTPUT_ON_FAILURE=1 - ctest -C %configuration% + - if exist "test\Release\std_filesystem_test.exe" test\Release\std_filesystem_test.exe & exit 0 - cd .. diff --git a/.travis.yml b/.travis.yml index c2e1638..e6c0233 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,9 @@ matrix: - env: MATRIX_EVAL="CC=gcc-8 && CXX=g++-8 && GENERATOR='Unix Makefiles' && CONFIG=Release" addons: { apt: { packages: ["g++-8"], sources: ["ubuntu-toolchain-r-test"] } } + - env: MATRIX_EVAL="CC=gcc-9 && CXX=g++-9 && GENERATOR='Unix Makefiles' && CONFIG=Release" + addons: { apt: { packages: ["g++-9"], sources: ["ubuntu-toolchain-r-test"] } } + - env: MATRIX_EVAL="CC=clang-5.0 && CXX=clang++-5.0 && GENERATOR='Unix Makefiles' && CONFIG=Release" addons: { apt: { packages: ["clang-5.0"] } } @@ -35,6 +38,9 @@ matrix: - env: MATRIX_EVAL="CC=clang-8 && CXX=clang++-8 && GENERATOR='Unix Makefiles' && CONFIG=Release" addons: { apt: { packages: ["clang-8", "libc++-8-dev", "libc++abi-8-dev"], sources: ["llvm-toolchain-xenial-8"] } } + - env: MATRIX_EVAL="CC=clang-9 && CXX=clang++-9 && GENERATOR='Unix Makefiles' && CONFIG=Release" + addons: { apt: { packages: ["clang-9", "libc++-9-dev", "libc++abi-9-dev"], sources: ["llvm-toolchain-xenial-9"] } } + - os: osx env: MATRIX_EVAL="CC=clang && CXX=clang++ && GENERATOR=Xcode && CONFIG=Release" osx_image: xcode9.2 @@ -83,6 +89,9 @@ script: else cmake --build . --config ${CONFIG} ctest -C ${CONFIG} -E Windows + if [ -f "test/std_filesystem_test" ]; then + test/std_filesystem_test || true + fi fi after_success: