Explorar el Código

Tests: Fix CPackComponentsForAll-RPM-IgnoreGroup test on Fedora 34

Update the cross-arch case from commit f174b919d6 (Tests: CpackRPM test
component architecture, 2015-02-19, v3.3.0-rc1~415^2~1) to use
`armv7hl`, which is supported by current RPM versions.

Fixes: #19983
Brad King hace 4 años
padre
commit
5130ff6878

+ 1 - 1
Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in

@@ -20,7 +20,7 @@ if(CPACK_GENERATOR MATCHES "RPM")
   set(CPACK_RPM_HEADERS_PACKAGE_ARCHITECTURE "noarch")
 
   # test cross-built rpm
-  set(CPACK_RPM_APPLICATIONS_PACKAGE_ARCHITECTURE "armv7hf")
+  set(CPACK_RPM_APPLICATIONS_PACKAGE_ARCHITECTURE "armv7hl")
 
   # test package summary override - headers rpm is generated in the middle
   set(CPACK_RPM_PACKAGE_SUMMARY "default summary")

+ 1 - 1
Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake

@@ -261,7 +261,7 @@ if(CPackGen MATCHES "RPM")
         set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
         set(check_file_match_expected_description ".*${CPACK_COMPONENT_APPLICATIONS_DESCRIPTION}.*")
         set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
-        set(check_file_match_expected_architecture "armv7hf")
+        set(check_file_match_expected_architecture "armv7hl")
         set(spec_regex "*applications*")
         set(check_content_list "^/usr/foo/bar
 /usr/foo/bar/bin