diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-10 17:55:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-06-10 18:06:21 (GMT) |
| commit | 5130ff6878547aa3096340d3a7f44485a211ea35 (patch) | |
| tree | 320fba3f9ed2351460b2556530b8ed6f4c17edb9 /Tests/CPackComponentsForAll | |
| parent | 5fd68d3ef75d590da383b5189ee7f952bd560a30 (diff) | |
| download | CMake-5130ff6878547aa3096340d3a7f44485a211ea35.zip CMake-5130ff6878547aa3096340d3a7f44485a211ea35.tar.gz CMake-5130ff6878547aa3096340d3a7f44485a211ea35.tar.bz2 | |
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
Diffstat (limited to 'Tests/CPackComponentsForAll')
| -rw-r--r-- | Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in | 2 | ||||
| -rw-r--r-- | Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in b/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in index a6f6ea9..1105cb8 100644 --- a/Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in +++ b/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") diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake index 31e843a..010b055 100644 --- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake +++ b/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 |