diff options
-rw-r--r-- | .ci.cmake | 6 | ||||
-rw-r--r-- | .travis.yml | 16 |
2 files changed, 12 insertions, 10 deletions
@@ -3,16 +3,18 @@ cmake_minimum_required(VERSION 3.1 FATAL_ERROR) include(cmake/QuickCppLibBootstrap.cmake) include(QuickCppLibUtils) - +message("*** CTEST_CONFIGURE_OPTIONS = ${CTEST_CONFIGURE_OPTIONS}") CONFIGURE_CTEST_SCRIPT_FOR_CDASH("llfio" "prebuilt") +list(APPEND CTEST_CONFIGURE_OPTIONS -DCMAKE_BUILD_TYPE=${CTEST_CONFIGURATION_TYPE}) +message("*** CTEST_CONFIGURE_OPTIONS = ${CTEST_CONFIGURE_OPTIONS}") ctest_empty_binary_directory(${CTEST_BINARY_DIRECTORY}) include(FindGit) set(CTEST_GIT_COMMAND "${GIT_EXECUTABLE}") ctest_start("Experimental") ctest_update() -ctest_configure(OPTIONS -DCMAKE_BUILD_TYPE=${CTEST_CONFIGURATION_TYPE};${CTEST_CONFIGURE_OPTIONS}) +ctest_configure(OPTIONS ${CTEST_CONFIGURE_OPTIONS}) ctest_build(TARGET _dl) ctest_build(TARGET _sl) set(retval 0) diff --git a/.travis.yml b/.travis.yml index d249cbfc..785ccefd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -79,19 +79,19 @@ before_install: - git submodule update --init --recursive - mount - # ctest -S .ci.cmake -V --timeout 300 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS ; +# mkdir build; +# cd build; +# cmake .. $CMAKE_CONFIGURE_OPTIONS -DCMAKE_BUILD_TYPE=Release; +# cmake --build . -- _sl; +# cmake --build . -- _dl; +# ctest -C Release -E llfio_hl|shared_fs_mutex; +# cd ..; script: - if [ "$__" = "cmake tests" ] || [ "$__" = "x64 cmake tests (error_code)" ] || [ "$__" = "x64 cmake tests (status_code)" ]; then export ASAN_OPTIONS=detect_leaks=0; - mkdir build; - cd build; - cmake .. $CMAKE_CONFIGURE_OPTIONS -DCMAKE_BUILD_TYPE=Release; - cmake --build . -- _sl; - cmake --build . -- _dl; - ctest -C Release; - cd ..; + ctest -S .ci.cmake -V --timeout 300 -DCTEST_CONFIGURE_OPTIONS=$CMAKE_CONFIGURE_OPTIONS ; fi - if [ "$__" = "ARM32 cmake tests (error_code)" ] || [ "$__" = "ARM32 cmake tests (status_code)" ]; then |