Tests/CPackWiXGenerator: support suppressing verification

Verification requires access to an active Windows session which may not
be the case in all testing environments.
This commit is contained in:
Ben Boeckel
2020-05-22 10:59:52 -04:00
parent 28f2ad9419
commit 165e56950a
2 changed files with 4 additions and 1 deletions

View File

@@ -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")

View File

@@ -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 ()