From 5130ff6878547aa3096340d3a7f44485a211ea35 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Jun 2021 13:55:37 -0400 Subject: 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 --- Tests/CPackComponentsForAll/MyLibCPackConfig-IgnoreGroup.cmake.in | 2 +- 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 -- cgit v0.12 From 60380bd77c93758774eb372c81c79fdf6557cffa Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Jun 2021 14:31:35 -0400 Subject: Tests: Fix RunCMake.CPack_RPM.DEBUGINFO test case Since commit c826745f5a (CPack/DEB: Do not crash when asked for debug symbols when there are none, 2020-10-29, v3.20.0-rc1~461^2) the test fails because CPackRPM warns about no sources in which to find debug symbols. Add expected output for this case. --- .../CPack/tests/DEBUGINFO/RPM-COMPONENT-stderr.txt | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Tests/RunCMake/CPack/tests/DEBUGINFO/RPM-COMPONENT-stderr.txt diff --git a/Tests/RunCMake/CPack/tests/DEBUGINFO/RPM-COMPONENT-stderr.txt b/Tests/RunCMake/CPack/tests/DEBUGINFO/RPM-COMPONENT-stderr.txt new file mode 100644 index 0000000..8f798bb --- /dev/null +++ b/Tests/RunCMake/CPack/tests/DEBUGINFO/RPM-COMPONENT-stderr.txt @@ -0,0 +1,17 @@ +^CMake Warning \(dev\) at [^ +]*/Modules/Internal/CPack/CPackRPM.cmake:[0-9]+ \(message\): + CPackRPM:Warning: debuginfo package was requested but will not be generated + as no source files were found! Component: 'appheaders'. +Call Stack \(most recent call first\): + [^ +]*/Modules/Internal/CPack/CPackRPM.cmake:[0-9]+ \(cpack_rpm_generate_package\) +This warning is for project developers. Use -Wno-dev to suppress it. ++ +CPackRPM: Will use GENERATED spec file: [^ +]*/Tests/RunCMake/RPM.DEBUGINFO/CPack/DEBUGINFO-build/_CPack_Packages/Linux/RPM/SPECS/Debuginfo-appheaders.spec +CPackRPM: Will use GENERATED spec file: [^ +]*/Tests/RunCMake/RPM.DEBUGINFO/CPack/DEBUGINFO-build/_CPack_Packages/Linux/RPM/SPECS/Debuginfo-applications.spec +CPackRPM: Will use GENERATED spec file: [^ +]*/Tests/RunCMake/RPM.DEBUGINFO/CPack/DEBUGINFO-build/_CPack_Packages/Linux/RPM/SPECS/Debuginfo-headers.spec +CPackRPM: Will use GENERATED spec file: [^ +]*/Tests/RunCMake/RPM.DEBUGINFO/CPack/DEBUGINFO-build/_CPack_Packages/Linux/RPM/SPECS/Debuginfo-libs.spec$ -- cgit v0.12 From 1186ed64d0b11c6ad34010bec0cc028780a7181e Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Jun 2021 09:31:48 -0400 Subject: ci: add rpm-build to Fedora base image This is needed to test the CPack RPM generator. --- .gitlab/ci/docker/fedora34/install_deps.sh | 4 ++++ .gitlab/os-linux.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/docker/fedora34/install_deps.sh b/.gitlab/ci/docker/fedora34/install_deps.sh index 146d51f..1992373 100755 --- a/.gitlab/ci/docker/fedora34/install_deps.sh +++ b/.gitlab/ci/docker/fedora34/install_deps.sh @@ -36,6 +36,10 @@ dnf install --setopt=install_weak_deps=False -y \ jq \ which +# Packages needed to test CPack. +dnf install --setopt=install_weak_deps=False -y \ + rpm-build + # Packages needed to test find modules. dnf install --setopt=install_weak_deps=False -y \ alsa-lib-devel \ diff --git a/.gitlab/os-linux.yml b/.gitlab/os-linux.yml index 997beab..6b490be 100644 --- a/.gitlab/os-linux.yml +++ b/.gitlab/os-linux.yml @@ -69,7 +69,7 @@ ### Fedora .fedora34: - image: "kitware/cmake:ci-fedora34-x86_64-2021-06-07" + image: "kitware/cmake:ci-fedora34-x86_64-2021-06-10" variables: GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake ci/long file name for testing purposes" -- cgit v0.12 From 369725faa5e410ca5fdc51c84e4f11af73b13ade Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 10 Jun 2021 10:02:06 -0400 Subject: gitlab-ci: add job to run CPack RPM tests Run tests on Fedora in a path without spaces so the RPM tests activate. --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 754b2a1..3765abc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -194,6 +194,18 @@ test:fedora34-makefiles: - .run_dependent - .needs_centos6_x86_64 +test:fedora34-makefiles-nospace: + extends: + - .fedora34_makefiles + - .cmake_test_linux_release + - .linux_builder_tags_qt + - .run_dependent + - .needs_centos6_x86_64 + variables: + GIT_CLONE_PATH: "$CI_BUILDS_DIR/cmake-ci" + CMAKE_CI_BUILD_NAME: fedora34_makefiles_nospace + CMAKE_CI_JOB_NIGHTLY: "true" + test:cuda10.2-nvidia: extends: - .cuda10.2_nvidia -- cgit v0.12