From 165e56950aef21468940384fe1b51cc7a676ef7d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 22 May 2020 10:59:52 -0400 Subject: Tests/CPackWiXGenerator: support suppressing verification Verification requires access to an active Windows session which may not be the case in all testing environments. --- Tests/CMakeLists.txt | 1 + Tests/CPackWiXGenerator/RunCPackVerifyResult.cmake | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) 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/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 () -- cgit v0.12