Imported Upstream version 3.21.0upstream/3.21.0

6 files changed, 105 insertions, 66 deletions

diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake
index de38df9ef..5a87c442b 100644
--- a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/ExpectedFiles.cmake
@@ -1,5 +1,10 @@
+if(RunCMake_SUBTEST_SUFFIX MATCHES ".*single_debug_info")
+  set(EXPECTED_FILE_1 "install_scripts-0.1.1-1.*.rpm")
+else()
+  set(EXPECTED_FILE_1_COMPONENT "foo")
+endif()
+
 set(EXPECTED_FILES_COUNT "2")
-set(EXPECTED_FILE_1_COMPONENT "foo")
 set(EXPECTED_FILE_CONTENT_1_LIST "/foo;/foo/CMakeLists.txt")
 set(EXPECTED_FILE_2_COMPONENT "bar")
 set(EXPECTED_FILE_CONTENT_2_LIST "/bar;/bar/CMakeLists.txt")
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-no_scripts_single_debug_info-stderr.txt b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-no_scripts_single_debug_info-stderr.txt
new file mode 100644
index 000000000..8d98f9deb
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-no_scripts_single_debug_info-stderr.txt
@@ -0,0 +1 @@
+.*
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-single_debug_info-stderr.txt b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-single_debug_info-stderr.txt
new file mode 100644
index 000000000..8d98f9deb
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-COMPONENT-single_debug_info-stderr.txt
@@ -0,0 +1 @@
+.*
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake
new file mode 100644
index 000000000..90cfe4467
--- /dev/null
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/RPM-Prerequirements.cmake
@@ -0,0 +1,11 @@
+function(get_test_prerequirements found_var config_file)
+  if(SUBTEST_SUFFIX MATCHES ".*single_debug_info")
+    include(${config_file})
+
+    if(OBJDUMP_EXECUTABLE)
+      set(${found_var} true PARENT_SCOPE)
+    endif()
+  else()
+    set(${found_var} true PARENT_SCOPE)
+  endif()
+endfunction()
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/VerifyResult.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/VerifyResult.cmake
index 1a1e98373..0c42d9069 100644
--- a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/VerifyResult.cmake
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/VerifyResult.cmake
@@ -7,23 +7,34 @@ function(checkScripts_ FILE COMPARE_LIST)
           ERROR_QUIET
           OUTPUT_STRIP_TRAILING_WHITESPACE)
 
-  string(REPLACE "\n" ";" FILE_SCRIPTS_LIST_ "${FILE_SCRIPTS_}")
+  if(COMPARE_LIST STREQUAL "")
+    if(NOT FILE_SCRIPTS_ STREQUAL "")
+      message(FATAL_ERROR "No scripts were expected in '${FILE}'; file info: '${FILE_SCRIPTS_}'")
+    endif()
+  else()
+    string(REPLACE "\n" ";" FILE_SCRIPTS_LIST_ "${FILE_SCRIPTS_}")
+
+    foreach(COMPARE_REGEX_ IN LISTS COMPARE_LIST)
+      unset(FOUND_)
 
-  foreach(COMPARE_REGEX_ IN LISTS COMPARE_LIST)
-    unset(FOUND_)
+      foreach(COMPARE_ IN LISTS FILE_SCRIPTS_LIST_)
+        if(COMPARE_ MATCHES "${COMPARE_REGEX_}")
+          set(FOUND_ true)
+          break()
+        endif()
+      endforeach()
 
-    foreach(COMPARE_ IN LISTS FILE_SCRIPTS_LIST_)
-      if(COMPARE_ MATCHES "${COMPARE_REGEX_}")
-        set(FOUND_ true)
-        break()
+      if(NOT FOUND_)
+        message(FATAL_ERROR "Missing scripts in '${FILE}'; file info: '${FILE_SCRIPTS_}'; missing: '${COMPARE_REGEX_}'")
       endif()
     endforeach()
-
-    if(NOT FOUND_)
-      message(FATAL_ERROR "Missing scripts in '${FILE}'; file info: '${FILE_SCRIPTS_}'; missing: '${COMPARE_REGEX_}'")
-    endif()
-  endforeach()
+  endif()
 endfunction()
 
-checkScripts_("${FOUND_FILE_1}" "echo \"pre install foo\";echo \"post install foo\";echo \"pre uninstall foo\";echo \"post uninstall foo\";echo \"pre trans foo\";echo \"post trans foo\"")
-checkScripts_("${FOUND_FILE_2}" "echo \"pre install\";echo \"post install\";echo \"pre uninstall\";echo \"post uninstall\";echo \"pre trans\";echo \"post trans\"")
+if(RunCMake_SUBTEST_SUFFIX MATCHES "no_scripts.*")
+  checkScripts_("${FOUND_FILE_1}" "")
+  checkScripts_("${FOUND_FILE_2}" "")
+else()
+  checkScripts_("${FOUND_FILE_1}" "echo \"pre install foo\";echo \"post install foo\";echo \"pre uninstall foo\";echo \"post uninstall foo\";echo \"pre trans foo\";echo \"post trans foo\"")
+  checkScripts_("${FOUND_FILE_2}" "echo \"pre install\";echo \"post install\";echo \"pre uninstall\";echo \"post uninstall\";echo \"pre trans\";echo \"post trans\"")
+endif()
diff --git a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
index c200fa502..ce5db0cfe 100644
--- a/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
+++ b/Tests/RunCMake/CPack/tests/INSTALL_SCRIPTS/test.cmake
@@ -1,60 +1,70 @@
 if(GENERATOR_TYPE STREQUAL "RPM")
-  set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh")
-  set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh")
-  set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh")
-  set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh")
-  set(CPACK_RPM_PRE_TRANS_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/pre_trans.sh")
-  set(CPACK_RPM_POST_TRANS_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/post_trans.sh")
-
-  set(CPACK_RPM_foo_PRE_INSTALL_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh")
-  set(CPACK_RPM_foo_POST_INSTALL_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh")
-  set(CPACK_RPM_foo_PRE_UNINSTALL_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh")
-  set(CPACK_RPM_foo_POST_UNINSTALL_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh")
-  set(CPACK_RPM_foo_PRE_TRANS_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/pre_trans_foo.sh")
-  set(CPACK_RPM_foo_POST_TRANS_SCRIPT_FILE
-    "${CMAKE_CURRENT_BINARY_DIR}/post_trans_foo.sh")
+  if(RunCMake_SUBTEST_SUFFIX MATCHES ".*single_debug_info")
+    set(CPACK_RPM_MAIN_COMPONENT "foo")
+    set(CPACK_RPM_DEBUGINFO_SINGLE_PACKAGE ON)
+    set(CPACK_RPM_FOO_FILE_NAME "RPM-DEFAULT")
+  endif()
 endif()
 
 set(CMAKE_BUILD_WITH_INSTALL_RPATH 1)
 
-# default
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh"
-    "echo \"pre install\"\n")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh"
-    "echo \"post install\"\n")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh"
-    "echo \"pre uninstall\"\n")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh"
-    "echo \"post uninstall\"\n")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_trans.sh"
-    "echo \"pre trans\"\n")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_trans.sh"
-    "echo \"post trans\"\n")
+if(NOT RunCMake_SUBTEST_SUFFIX MATCHES "no_scripts.*")
+  if(GENERATOR_TYPE STREQUAL "RPM")
+    set(CPACK_RPM_PRE_INSTALL_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh")
+    set(CPACK_RPM_POST_INSTALL_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh")
+    set(CPACK_RPM_PRE_UNINSTALL_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh")
+    set(CPACK_RPM_POST_UNINSTALL_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh")
+    set(CPACK_RPM_PRE_TRANS_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/pre_trans.sh")
+    set(CPACK_RPM_POST_TRANS_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/post_trans.sh")
+
+    set(CPACK_RPM_foo_PRE_INSTALL_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh")
+    set(CPACK_RPM_foo_POST_INSTALL_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh")
+    set(CPACK_RPM_foo_PRE_UNINSTALL_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh")
+    set(CPACK_RPM_foo_POST_UNINSTALL_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh")
+    set(CPACK_RPM_foo_PRE_TRANS_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/pre_trans_foo.sh")
+    set(CPACK_RPM_foo_POST_TRANS_SCRIPT_FILE
+      "${CMAKE_CURRENT_BINARY_DIR}/post_trans_foo.sh")
+  endif()
 
-# specific
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh"
-    "echo \"pre install foo\"\n")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh"
-    "echo \"post install foo\"\n")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh"
-    "echo \"pre uninstall foo\"\n")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh"
-    "echo \"post uninstall foo\"\n")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_trans_foo.sh"
-    "echo \"pre trans foo\"\n")
-file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_trans_foo.sh"
-    "echo \"post trans foo\"\n")
+  # default
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh"
+      "echo \"pre install\"\n")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_install.sh"
+      "echo \"post install\"\n")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall.sh"
+      "echo \"pre uninstall\"\n")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall.sh"
+      "echo \"post uninstall\"\n")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_trans.sh"
+      "echo \"pre trans\"\n")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_trans.sh"
+      "echo \"post trans\"\n")
+
+  # specific
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_install_foo.sh"
+      "echo \"pre install foo\"\n")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_install_foo.sh"
+      "echo \"post install foo\"\n")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_uninstall_foo.sh"
+      "echo \"pre uninstall foo\"\n")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh"
+      "echo \"post uninstall foo\"\n")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/pre_trans_foo.sh"
+      "echo \"pre trans foo\"\n")
+  file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_trans_foo.sh"
+      "echo \"post trans foo\"\n")
+endif()
 
 install(FILES CMakeLists.txt DESTINATION foo COMPONENT foo)
 install(FILES CMakeLists.txt DESTINATION bar COMPONENT bar)