From 38cc66310c441ed34b045a58cb92e0eae75f2cb3 Mon Sep 17 00:00:00 2001 From: mulhern Date: Mon, 22 Sep 2025 10:42:22 -0400 Subject: [PATCH 1/2] Make RHEL 9 and RHEL 10 cargo_test arguments consistent The recent release of Rust 1.90.0 has added macro changes that have this effect. Signed-off-by: mulhern --- mockbuild_test/stratisd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mockbuild_test/stratisd.spec b/mockbuild_test/stratisd.spec index 0bf4319..98c9e87 100644 --- a/mockbuild_test/stratisd.spec +++ b/mockbuild_test/stratisd.spec @@ -109,7 +109,7 @@ a2x -f manpage docs/stratis-dumpmetadata.txt %if %{with check} %check -%if 0%{?rhel} && 0%{?rhel} < 10 +%if 0%{?rhel} && 0%{?rhel} < 9 %cargo_test --no-run %else %cargo_test -- --no-run From 0d6ec9d7a797f353c9e6da640f94ca7eb587e19b Mon Sep 17 00:00:00 2001 From: mulhern Date: Fri, 26 Sep 2025 09:45:54 -0400 Subject: [PATCH 2/2] Remove the special conditional for %rhel entirely This spec file will never be considered for RHEL8 anyway. Signed-off-by: mulhern --- mockbuild_test/stratisd.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mockbuild_test/stratisd.spec b/mockbuild_test/stratisd.spec index 98c9e87..c958880 100644 --- a/mockbuild_test/stratisd.spec +++ b/mockbuild_test/stratisd.spec @@ -109,12 +109,8 @@ a2x -f manpage docs/stratis-dumpmetadata.txt %if %{with check} %check -%if 0%{?rhel} && 0%{?rhel} < 9 -%cargo_test --no-run -%else %cargo_test -- --no-run %endif -%endif %post %systemd_post stratisd.service