From 3f9f17af50aa192276e0bfccdb3ce47cf22c2210 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Thu, 10 Jun 2021 06:25:14 +0300 Subject: [PATCH] Update .travis.yml, appveyor.yml --- .travis.yml | 7 ++++--- appveyor.yml | 12 ++++++------ 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3afe36c..d58b198 100644 --- a/.travis.yml +++ b/.travis.yml @@ -324,8 +324,9 @@ matrix: env: CMAKE=1 script: - mkdir __build__ && cd __build__ - - cmake -DBOOST_ENABLE_CMAKE=1 -DBUILD_TESTING=ON -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=assert .. - - ctest --output-on-failure -R boost_assert + - cmake -DBUILD_TESTING=ON -DBOOST_INCLUDE_LIBRARIES=assert .. + - cmake --build . --target tests + - ctest --output-on-failure - os: linux env: CMAKE_SUBDIR=1 @@ -342,7 +343,7 @@ matrix: env: CMAKE_INSTALL=1 script: - mkdir __build__ && cd __build__ - - cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=assert -DCMAKE_INSTALL_PREFIX=~/.local .. + - cmake -DBOOST_INCLUDE_LIBRARIES=assert -DCMAKE_INSTALL_PREFIX=~/.local .. - cmake --build . --target install - cd ../libs/assert/test/cmake_install_test && mkdir __build__ && cd __build__ - cmake -DCMAKE_INSTALL_PREFIX=~/.local .. diff --git a/appveyor.yml b/appveyor.yml index 9793876..c42111a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -61,11 +61,11 @@ test_script: - if "%CMAKE%%CMAKE_SUBDIR%%CMAKE_INSTALL%" == "" b2 -j 3 libs/assert/test toolset=%TOOLSET% %CXXSTD% %ADDRMD% - if not "%CMAKE%" == "" mkdir __build__ && cd __build__ - - if not "%CMAKE%" == "" cmake -DBOOST_ENABLE_CMAKE=1 -DBUILD_TESTING=ON -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES=assert .. - - if not "%CMAKE%" == "" ctest --output-on-failure -R boost_assert -C Debug - - if not "%CMAKE%" == "" ctest --output-on-failure -R boost_assert -C Release - - if not "%CMAKE%" == "" ctest --output-on-failure -R boost_assert -C MinSizeRel - - if not "%CMAKE%" == "" ctest --output-on-failure -R boost_assert -C RelWithDebInfo + - if not "%CMAKE%" == "" cmake -DBUILD_TESTING=ON -DBOOST_INCLUDE_LIBRARIES=assert .. + - if not "%CMAKE%" == "" cmake --build . --target tests --config Debug & ctest --output-on-failure -C Debug + - if not "%CMAKE%" == "" cmake --build . --target tests --config Release & ctest --output-on-failure -C Release + - if not "%CMAKE%" == "" cmake --build . --target tests --config MinSizeRel & ctest --output-on-failure -C MinSizeRel + - if not "%CMAKE%" == "" cmake --build . --target tests --config RelWithDebInfo & ctest --output-on-failure -C RelWithDebInfo - if not "%CMAKE_SUBDIR%" == "" cd libs/assert/test/cmake_subdir_test && mkdir __build__ && cd __build__ - if not "%CMAKE_SUBDIR%" == "" cmake .. @@ -75,7 +75,7 @@ test_script: - if not "%CMAKE_SUBDIR%" == "" cmake --build . --config RelWithDebInfo && cmake --build . --target check --config RelWithDebInfo - if not "%CMAKE_INSTALL%" == "" mkdir __build__ && cd __build__ - - if not "%CMAKE_INSTALL%" == "" cmake -DBOOST_ENABLE_CMAKE=1 -DBoost_VERBOSE=1 -DBOOST_INCLUDE_LIBRARIES="assert;config" -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix .. + - if not "%CMAKE_INSTALL%" == "" cmake -DBOOST_INCLUDE_LIBRARIES=assert -DCMAKE_INSTALL_PREFIX=C:/cmake-prefix .. - if not "%CMAKE_INSTALL%" == "" cmake --build . --target install --config Debug - if not "%CMAKE_INSTALL%" == "" cmake --build . --target install --config Release - if not "%CMAKE_INSTALL%" == "" cd ../libs/assert/test/cmake_install_test && mkdir __build__ && cd __build__