From 96af69a1188e86c641fe8e4a04ab5c49b65bee48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Ferr=C3=A3o?=
 <2031761+viniciusferrao@users.noreply.github.com>
Date: Sun, 27 Sep 2026 13:50:26 -0300
Subject: [PATCH] test(build): accept more riscv64 requirements beside
 ipmitool-xcat

The next commit adds ipxe-xcat to the riscv64 requirements of xCAT and
xCATsn, and moves the riscv64 block of xCATsn into its ppc block. The
test now finds the block that covers riscv64 and checks that it
requires ipmitool-xcat.
---
 xCAT-test/unit/riscv64_packaging.t | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/xCAT-test/unit/riscv64_packaging.t b/xCAT-test/unit/riscv64_packaging.t
index f4f456481..f21bbfc88 100644
--- a/xCAT-test/unit/riscv64_packaging.t
+++ b/xCAT-test/unit/riscv64_packaging.t
@@ -16,8 +16,8 @@ use XCAT::BuildUtils qw(targetarch_from_target);
 # packages, so there is no arch-named Genesis package to resolve here.
 
 my $xcat = slurp_repo_file('xCAT/xCAT.spec');
-like( $xcat, qr/^%ifarch riscv64\n(?:#[^\n]*\n)*Requires: ipmitool-xcat >= 1\.8\.18-4\n%endif$/m, 'xCAT.spec requires ipmitool-xcat on riscv64' );
 my ($xcat_rv) = $xcat =~ /^%ifarch riscv64\n((?:#[^\n]*\n|Requires:[^\n]*\n)*)%endif$/m;
+like( $xcat_rv || '', qr/^Requires: ipmitool-xcat >= 1\.8\.18-4$/m, 'xCAT.spec requires ipmitool-xcat on riscv64' );
 unlike( $xcat_rv || '', qr/xnba-undi|syslinux-xcat|elilo-xcat/, 'xCAT.spec does not require the x86 PXE loaders on riscv64' );
 
 # riscv64 has no legacy Genesis package: the requirement must disappear rather than
@@ -43,7 +43,8 @@ SKIP: {
 }
 
 my $xcatsn = slurp_repo_file('xCATsn/xCATsn.spec');
-like( $xcatsn, qr/^%ifarch riscv64\nRequires: ipmitool-xcat >= 1\.8\.17-1\n%endif$/m, 'xCATsn.spec requires ipmitool-xcat on riscv64' );
+my ($xcatsn_rv) = $xcatsn =~ /^%ifarch [^\n]*\briscv64\b[^\n]*\n((?:#[^\n]*\n|Requires:[^\n]*\n)*)%endif$/m;
+like( $xcatsn_rv || '', qr/^Requires: ipmitool-xcat >= 1\.8\.17-1$/m, 'xCATsn.spec requires ipmitool-xcat on riscv64' );
 like( $xcatsn, qr/^Recommends: xCAT-genesis-openembedded-riscv64$/m, 'xCATsn.spec recommends the RISC-V OpenEmbedded Genesis image' );
 
 my $server = slurp_repo_file('xCAT-server/xCAT-server.spec');