diff options
| author | Brad King <brad.king@kitware.com> | 2020-05-25 15:09:53 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-05-25 15:10:06 (GMT) |
| commit | 3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db (patch) | |
| tree | 0a8b030dd26e121451aceca82e8ddef8439a81ae /Tests | |
| parent | a354b7f21e858728606ddc7c275bad35914d8eaa (diff) | |
| parent | b566f0b30817270c89fc64bb11fade61bd08d0c0 (diff) | |
| download | CMake-3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db.zip CMake-3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db.tar.gz CMake-3ed8b663a9fd6e8d6f7ec0571ab1e3530f9156db.tar.bz2 | |
Merge topic 'gitlab-ci-regular-builders'
b566f0b308 gitlab-ci: add windows builder
5b564c371e gitlab-ci: add Windows infrastructure
809f9a9916 gitlab: add powershell scripts for utilities
02c56b71a1 gitlab-ci: add a macos builder
a1b1fc611b gitlab-ci: add Linux makefiles and ninja builders
3e1a1ba92d ci: add dependencies for the test suite to the Fedora image
d5438f783a ci: add make to the CI image
0ed7e424ab gitlab-ci: use the cmake_build_unix anchor
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4723
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | Tests/CPackWiXGenerator/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/export/DependOnDoubleExport-stderr.txt | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 0c8a639..d7e567c 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -978,6 +978,7 @@ ${CMake_SOURCE_DIR}/Utilities/Release/push.bash --dir dev -- '${CMake_BUILD_NIGH --build-options --test-command ${CMAKE_CMAKE_COMMAND} "-DCPackWiXGenerator_BINARY_DIR:PATH=${CMake_BINARY_DIR}/Tests/CPackWiXGenerator" + "-Dno_verify:BOOL=${CMake_TEST_WIX_NO_VERIFY}" "-Dconfig=\${CTEST_CONFIGURATION_TYPE}" -P "${CMake_SOURCE_DIR}/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake") diff --git a/Tests/CPackWiXGenerator/CMakeLists.txt b/Tests/CPackWiXGenerator/CMakeLists.txt index 73eaf4f..940e849 100644 --- a/Tests/CPackWiXGenerator/CMakeLists.txt +++ b/Tests/CPackWiXGenerator/CMakeLists.txt @@ -49,6 +49,9 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "CPack Component Example") set(CPACK_WIX_UPGRADE_GUID "BF20CE5E-7F7C-401D-8F7C-AB45E8D170E6") set(CPACK_WIX_UNINSTALL "1") +# Support non-interactive sessions (like CI). +set(CPACK_WIX_LIGHT_EXTRA_FLAGS "-sval") + set(CPACK_PACKAGE_EXECUTABLES "my-libapp" "CPack WiX Test" "my-other-app" "Second CPack WiX Test" diff --git a/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake b/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake index ca9fd90..c549e61 100644 --- a/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake +++ b/Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake @@ -74,4 +74,6 @@ endforeach() # error SMOK1076 : ICE61: This product should remove only older # versions of itself. The Maximum version is not less # than the current product. (1.0.0 1.0.0) -run_wix_command(smoke -nologo -wx -sw1076 "${installer_file}") +if (NOT no_verify) + run_wix_command(smoke -nologo -wx -sw1076 "${installer_file}") +endif () diff --git a/Tests/RunCMake/export/DependOnDoubleExport-stderr.txt b/Tests/RunCMake/export/DependOnDoubleExport-stderr.txt index b78c7e4..e8f8a09 100644 --- a/Tests/RunCMake/export/DependOnDoubleExport-stderr.txt +++ b/Tests/RunCMake/export/DependOnDoubleExport-stderr.txt @@ -3,8 +3,7 @@ CMake Error in CMakeLists.txt: that is not in this export set, but in multiple other export sets: .*/Tests/RunCMake/export/DependOnDoubleExport-build/exportset.cmake, .*/Tests/RunCMake/export/DependOnDoubleExport-build/manual.cmake. - - ++ An exported target cannot depend upon another target which is exported multiple times. Consider consolidating the exports of the "doubleexported" target to a single export. |