From e7f5ad8df2f8dda35fea51b7c01f068497c16940 Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 19 Mar 2024 19:07:40 -0400 Subject: Tests: Prepare RunCMake.CPack_WIX to cover multiple WiX versions --- .../CPack_WIX/3-AppWiX-cpack-WIX-check.cmake | 1 + .../CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt | 11 ++++++++ .../RunCMake/CPack_WIX/3-AppWiX-verify-stdout.txt | 33 ++++++++++++++++++++++ .../CPack_WIX/AppWiX-cpack-WIX-check.cmake | 1 - .../RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt | 11 -------- Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt | 33 ---------------------- Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake | 13 +++++++-- 7 files changed, 56 insertions(+), 47 deletions(-) create mode 100644 Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-check.cmake create mode 100644 Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt create mode 100644 Tests/RunCMake/CPack_WIX/3-AppWiX-verify-stdout.txt delete mode 100644 Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-check.cmake delete mode 100644 Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt delete mode 100644 Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt diff --git a/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-check.cmake b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-check.cmake new file mode 100644 index 0000000..a7a28ae --- /dev/null +++ b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-check.cmake @@ -0,0 +1 @@ +include(${RunCMake_SOURCE_DIR}/cpack-check-common.cmake) diff --git a/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt new file mode 100644 index 0000000..2998440 --- /dev/null +++ b/Tests/RunCMake/CPack_WIX/3-AppWiX-cpack-WIX-stdout.txt @@ -0,0 +1,11 @@ +CPack: Create package using WIX +CPack: Install projects +CPack: - Install project: CPackWiXGenerator \[Release\] +CPack: - Install component: applications +CPack: - Install component: applications2 +CPack: - Install component: extras +CPack: - Install component: headers +CPack: - Install component: libraries +CPack: Create package +CPack: - package: [^ +]*/Tests/RunCMake/CPack_WIX/3-AppWiX-build/MyLib-1\.0\.0-(win64|windows-arm64)\.msi generated\. diff --git a/Tests/RunCMake/CPack_WIX/3-AppWiX-verify-stdout.txt b/Tests/RunCMake/CPack_WIX/3-AppWiX-verify-stdout.txt new file mode 100644 index 0000000..4713447 --- /dev/null +++ b/Tests/RunCMake/CPack_WIX/3-AppWiX-verify-stdout.txt @@ -0,0 +1,33 @@ +-- MyLib-1\.0\.0-(win64|windows-arm64)\.msi +Component: 'CM_CP_applications.bin.my_libapp.exe' 'CM_DP_applications.bin' +Component: 'CM_SHORTCUT_applications' 'PROGRAM_MENU_FOLDER' +Component: 'CM_SHORTCUT_DESKTOP_applications' 'DesktopFolder' +Component: 'CM_CP_applications2.bin.my_other_app.exe' 'CM_DP_applications2.bin' +Component: 'CM_SHORTCUT_applications2' 'PROGRAM_MENU_FOLDER' +Component: 'CM_SHORTCUT_DESKTOP_applications2' 'DesktopFolder' +Component: 'CM_C_EMPTY_CM_DP_extras.extras.empty' 'CM_DP_extras.extras.empty' +Component: 'CM_CP_headers.include.file_with_spaces.h' 'CM_DP_headers.include' +Component: 'CM_CP_headers.include.mylib.h' 'CM_DP_headers.include' +Component: 'CM_CP_libraries.lib.mylib.lib' 'CM_DP_libraries.lib' +Directory: 'INSTALL_ROOT' 'ProgramFiles64Folder' '[^']*\|CPack Component Example' +Directory: 'CM_DP_applications.bin' 'INSTALL_ROOT' 'bin' +Directory: 'PROGRAM_MENU_FOLDER' 'ProgramMenuFolder' 'MyLib' +Directory: 'DesktopFolder' 'TARGETDIR' 'Desktop' +Directory: 'CM_DP_applications2.bin' 'INSTALL_ROOT' 'bin' +Directory: 'CM_DP_extras.extras.empty' 'CM_DP_extras.extras' 'empty' +Directory: 'CM_DP_headers.include' 'INSTALL_ROOT' 'include' +Directory: 'CM_DP_libraries.lib' 'INSTALL_ROOT' 'lib' +Directory: 'CM_DP_extras.extras' 'INSTALL_ROOT' 'extras' +Directory: 'ProgramFiles64Folder' 'TARGETDIR' '.' +Directory: 'TARGETDIR' '' 'SourceDir' +Directory: 'ProgramMenuFolder' 'TARGETDIR' '.' +File: 'CM_FP_applications.bin.my_libapp.exe' 'CM_CP_applications.bin.my_libapp.exe' '[^']*\|my-libapp.exe' +File: 'CM_FP_applications2.bin.my_other_app.exe' 'CM_CP_applications2.bin.my_other_app.exe' '[^']*\|my-other-app.exe' +File: 'CM_FP_headers.include.file_with_spaces.h' 'CM_CP_headers.include.file_with_spaces.h' '[^']*\|file with spaces.h' +File: 'CM_FP_headers.include.mylib.h' 'CM_CP_headers.include.mylib.h' 'mylib.h' +File: 'CM_FP_libraries.lib.mylib.lib' 'CM_CP_libraries.lib.mylib.lib' 'mylib.lib' +Shortcut: 'CM_SP_applications.bin.my_libapp.exe' 'PROGRAM_MENU_FOLDER' '[^']*\|CPack WiX Test' 'CM_SHORTCUT_applications' +Shortcut: 'CM_DSP_applications.bin.my_libapp.exe' 'DesktopFolder' '[^']*\|CPack WiX Test' 'CM_SHORTCUT_DESKTOP_applications' +Shortcut: 'CM_SP_applications2.bin.my_other_app.exe' 'PROGRAM_MENU_FOLDER' '[^']*\|Second CPack WiX Test' 'CM_SHORTCUT_applications2' +Shortcut: 'CM_DSP_applications2.bin.my_other_app.exe' 'DesktopFolder' '[^']*\|Second CPack WiX Test' 'CM_SHORTCUT_DESKTOP_applications2' +-- diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-check.cmake b/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-check.cmake deleted file mode 100644 index a7a28ae..0000000 --- a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-check.cmake +++ /dev/null @@ -1 +0,0 @@ -include(${RunCMake_SOURCE_DIR}/cpack-check-common.cmake) diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt b/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt deleted file mode 100644 index 110b36e..0000000 --- a/Tests/RunCMake/CPack_WIX/AppWiX-cpack-WIX-stdout.txt +++ /dev/null @@ -1,11 +0,0 @@ -CPack: Create package using WIX -CPack: Install projects -CPack: - Install project: CPackWiXGenerator \[Release\] -CPack: - Install component: applications -CPack: - Install component: applications2 -CPack: - Install component: extras -CPack: - Install component: headers -CPack: - Install component: libraries -CPack: Create package -CPack: - package: [^ -]*/Tests/RunCMake/CPack_WIX/AppWiX-build/MyLib-1\.0\.0-(win64|windows-arm64)\.msi generated\. diff --git a/Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt b/Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt deleted file mode 100644 index 4713447..0000000 --- a/Tests/RunCMake/CPack_WIX/AppWiX-verify-stdout.txt +++ /dev/null @@ -1,33 +0,0 @@ --- MyLib-1\.0\.0-(win64|windows-arm64)\.msi -Component: 'CM_CP_applications.bin.my_libapp.exe' 'CM_DP_applications.bin' -Component: 'CM_SHORTCUT_applications' 'PROGRAM_MENU_FOLDER' -Component: 'CM_SHORTCUT_DESKTOP_applications' 'DesktopFolder' -Component: 'CM_CP_applications2.bin.my_other_app.exe' 'CM_DP_applications2.bin' -Component: 'CM_SHORTCUT_applications2' 'PROGRAM_MENU_FOLDER' -Component: 'CM_SHORTCUT_DESKTOP_applications2' 'DesktopFolder' -Component: 'CM_C_EMPTY_CM_DP_extras.extras.empty' 'CM_DP_extras.extras.empty' -Component: 'CM_CP_headers.include.file_with_spaces.h' 'CM_DP_headers.include' -Component: 'CM_CP_headers.include.mylib.h' 'CM_DP_headers.include' -Component: 'CM_CP_libraries.lib.mylib.lib' 'CM_DP_libraries.lib' -Directory: 'INSTALL_ROOT' 'ProgramFiles64Folder' '[^']*\|CPack Component Example' -Directory: 'CM_DP_applications.bin' 'INSTALL_ROOT' 'bin' -Directory: 'PROGRAM_MENU_FOLDER' 'ProgramMenuFolder' 'MyLib' -Directory: 'DesktopFolder' 'TARGETDIR' 'Desktop' -Directory: 'CM_DP_applications2.bin' 'INSTALL_ROOT' 'bin' -Directory: 'CM_DP_extras.extras.empty' 'CM_DP_extras.extras' 'empty' -Directory: 'CM_DP_headers.include' 'INSTALL_ROOT' 'include' -Directory: 'CM_DP_libraries.lib' 'INSTALL_ROOT' 'lib' -Directory: 'CM_DP_extras.extras' 'INSTALL_ROOT' 'extras' -Directory: 'ProgramFiles64Folder' 'TARGETDIR' '.' -Directory: 'TARGETDIR' '' 'SourceDir' -Directory: 'ProgramMenuFolder' 'TARGETDIR' '.' -File: 'CM_FP_applications.bin.my_libapp.exe' 'CM_CP_applications.bin.my_libapp.exe' '[^']*\|my-libapp.exe' -File: 'CM_FP_applications2.bin.my_other_app.exe' 'CM_CP_applications2.bin.my_other_app.exe' '[^']*\|my-other-app.exe' -File: 'CM_FP_headers.include.file_with_spaces.h' 'CM_CP_headers.include.file_with_spaces.h' '[^']*\|file with spaces.h' -File: 'CM_FP_headers.include.mylib.h' 'CM_CP_headers.include.mylib.h' 'mylib.h' -File: 'CM_FP_libraries.lib.mylib.lib' 'CM_CP_libraries.lib.mylib.lib' 'mylib.lib' -Shortcut: 'CM_SP_applications.bin.my_libapp.exe' 'PROGRAM_MENU_FOLDER' '[^']*\|CPack WiX Test' 'CM_SHORTCUT_applications' -Shortcut: 'CM_DSP_applications.bin.my_libapp.exe' 'DesktopFolder' '[^']*\|CPack WiX Test' 'CM_SHORTCUT_DESKTOP_applications' -Shortcut: 'CM_SP_applications2.bin.my_other_app.exe' 'PROGRAM_MENU_FOLDER' '[^']*\|Second CPack WiX Test' 'CM_SHORTCUT_applications2' -Shortcut: 'CM_DSP_applications2.bin.my_other_app.exe' 'DesktopFolder' '[^']*\|Second CPack WiX Test' 'CM_SHORTCUT_DESKTOP_applications2' --- diff --git a/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake b/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake index cd525d0..cf14d7d 100644 --- a/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake +++ b/Tests/RunCMake/CPack_WIX/RunCMakeTest.cmake @@ -1,7 +1,16 @@ include(RunCPack) +set(env_PATH "$ENV{PATH}") + set(RunCPack_GENERATORS WIX) +set(RunCPack_GLOB *.msi) +set(RunCPack_VERIFY powershell -ExecutionPolicy Bypass -File ${CMAKE_CURRENT_LIST_DIR}/print-msi.ps1) -set(ENV{PATH} "${CMake_TEST_CPACK_WIX3};$ENV{PATH}") +function(run_cpack_wix v) + run_cpack(${v}-AppWiX SAMPLE AppWiX BUILD) +endfunction() -run_cpack(AppWiX BUILD GLOB *.msi VERIFY powershell -ExecutionPolicy Bypass -File ${CMAKE_CURRENT_LIST_DIR}/print-msi.ps1) +if(CMake_TEST_CPACK_WIX3) + set(ENV{PATH} "${CMake_TEST_CPACK_WIX3};${env_PATH}") + run_cpack_wix(3) +endif() -- cgit v0.12