From bdfe7a4a2c3153055ca4a5bed57e0f592e832989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?= <2031761+viniciusferrao@users.noreply.github.com> Date: Tue, 11 Aug 2026 20:45:20 -0300 Subject: [PATCH] build(server): cover s390x Digest::SHA --- xCAT-server/xCAT-server.spec | 2 +- xCAT-test/unit/xcat_server_digest_sha_dependency.t | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/xCAT-server/xCAT-server.spec b/xCAT-server/xCAT-server.spec index e7e381ad0..2c4f4b1a6 100644 --- a/xCAT-server/xCAT-server.spec +++ b/xCAT-server/xCAT-server.spec @@ -38,7 +38,7 @@ BuildArch: noarch # Note: ifarch/ifnarch does not work for noarch package, use environment variable instead %if %s390x -Requires: perl-IO-Socket-SSL perl-XML-Simple perl-XML-Parser +Requires: perl-IO-Socket-SSL perl-XML-Simple perl-XML-Parser perl(Digest::SHA) %else %if 0%{?rhel} >= 8 BuildRequires: perl-generators diff --git a/xCAT-test/unit/xcat_server_digest_sha_dependency.t b/xCAT-test/unit/xcat_server_digest_sha_dependency.t index 8077fcaf7..417668eb0 100644 --- a/xCAT-test/unit/xcat_server_digest_sha_dependency.t +++ b/xCAT-test/unit/xcat_server_digest_sha_dependency.t @@ -22,10 +22,12 @@ sub read_file { my $rpm_spec = read_file( File::Spec->catfile( $repo_root, 'xCAT-server', 'xCAT-server.spec' ) ); -like( - $rpm_spec, - qr/^Requires:.*\bperl\(Digest::SHA\)(?:\s|$)/m, - 'the RPM package requires Digest::SHA', +my @rpm_sha_requirements = + $rpm_spec =~ /^Requires:.*\bperl\(Digest::SHA\)(?:\s|$)/mg; +is( + scalar(@rpm_sha_requirements), + 2, + 'both RPM architecture branches require Digest::SHA', ); my $debian_control = read_file(