echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Brad King 2021-06-10 13:55:37 -04:00
parent 5fd68d3ef7
commit 5130ff6878
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in
View File

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

2
Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
View File

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