diff options
| author | Brad King <brad.king@kitware.com> | 2023-07-27 13:54:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-07-27 13:54:11 (GMT) |
| commit | b8c4607b28a4c1b352914db58ef502176e8d8d17 (patch) | |
| tree | f2720dd176a52ee1469f9201e0ad8034aeeb09ee | |
| parent | d68fa82d8d5bb14cb4e40c9b45f7afad408c3eaa (diff) | |
| parent | 077678d3f9a3bc6953d6f50dc1708ce164ab5a56 (diff) | |
| download | CMake-b8c4607b28a4c1b352914db58ef502176e8d8d17.zip CMake-b8c4607b28a4c1b352914db58ef502176e8d8d17.tar.gz CMake-b8c4607b28a4c1b352914db58ef502176e8d8d17.tar.bz2 | |
Merge topic 'ci-more-tests'
077678d3f9 ci: test CDash submission tests on some nightly dashboards
fe55a0ebf4 ci: enable more tests to better match nightly dashboards
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !8646
| -rw-r--r-- | .gitlab/ci/configure_common.cmake | 4 | ||||
| -rw-r--r-- | .gitlab/ci/configure_debian10_ninja.cmake | 4 | ||||
| -rw-r--r-- | .gitlab/ci/configure_fedora38_makefiles_clang.cmake | 4 | ||||
| -rw-r--r-- | .gitlab/ci/configure_macos_arm64_ninja_multi.cmake | 1 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_vs2019_x64.cmake | 4 |
5 files changed, 17 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_common.cmake b/.gitlab/ci/configure_common.cmake index c207a74..f03c4b8 100644 --- a/.gitlab/ci/configure_common.cmake +++ b/.gitlab/ci/configure_common.cmake @@ -13,6 +13,10 @@ set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCY "ON" CACHE BOOL "") set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/install" CACHE PATH "") set(CMake_TEST_INSTALL "OFF" CACHE BOOL "") +set(CTEST_TEST_CTEST ON CACHE BOOL "") +set(CMAKE_RUN_LONG_TESTS ON CACHE BOOL "") +set(CMAKE_TESTS_CDASH_SERVER "NOTFOUND" CACHE STRING "") + if (NOT "$ENV{CMAKE_CI_BUILD_TYPE}" STREQUAL "") set(CMAKE_BUILD_TYPE "$ENV{CMAKE_CI_BUILD_TYPE}" CACHE STRING "") endif () diff --git a/.gitlab/ci/configure_debian10_ninja.cmake b/.gitlab/ci/configure_debian10_ninja.cmake index eca92bc..0576d11 100644 --- a/.gitlab/ci/configure_debian10_ninja.cmake +++ b/.gitlab/ci/configure_debian10_ninja.cmake @@ -107,4 +107,8 @@ if (NOT "$ENV{SWIFTC}" STREQUAL "") set(CMAKE_Swift_COMPILER "$ENV{SWIFTC}" CACHE FILEPATH "") endif() +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMAKE_TESTS_CDASH_SERVER "https://open.cdash.org" CACHE STRING "") +endif() + include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_fedora38_makefiles_clang.cmake b/.gitlab/ci/configure_fedora38_makefiles_clang.cmake index ff30ad9..3ac23be 100644 --- a/.gitlab/ci/configure_fedora38_makefiles_clang.cmake +++ b/.gitlab/ci/configure_fedora38_makefiles_clang.cmake @@ -1 +1,5 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMAKE_TESTS_CDASH_SERVER "https://open.cdash.org" CACHE STRING "") +endif() + include("${CMAKE_CURRENT_LIST_DIR}/configure_fedora38_common_clang.cmake") diff --git a/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake b/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake index d81bd30..5b19c60 100644 --- a/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake +++ b/.gitlab/ci/configure_macos_arm64_ninja_multi.cmake @@ -1,5 +1,6 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") set(CMake_TEST_ISPC "ON" CACHE STRING "") + set(CMAKE_TESTS_CDASH_SERVER "https://open.cdash.org" CACHE STRING "") endif() # FIXME: sccache sometimes fails with "Compiler killed by signal 9". diff --git a/.gitlab/ci/configure_windows_vs2019_x64.cmake b/.gitlab/ci/configure_windows_vs2019_x64.cmake index c7d41ea..b859525 100644 --- a/.gitlab/ci/configure_windows_vs2019_x64.cmake +++ b/.gitlab/ci/configure_windows_vs2019_x64.cmake @@ -1 +1,5 @@ +if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") + set(CMAKE_TESTS_CDASH_SERVER "https://open.cdash.org" CACHE STRING "") +endif() + include("${CMAKE_CURRENT_LIST_DIR}/configure_windows_vs_common.cmake") |