From 720c95ddfc4524658877c99a47c46a9664f00ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Tue, 10 Oct 2023 15:46:25 +0200 Subject: [PATCH] More environments work with 9.3.0-like builds --- tests/testsuite/main.fmf | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/tests/testsuite/main.fmf b/tests/testsuite/main.fmf index a279b49..6124601 100644 --- a/tests/testsuite/main.fmf +++ b/tests/testsuite/main.fmf @@ -18,16 +18,38 @@ require+: # Adjust rules adjust+: - - because: "On RHEL-9, system binutils build extra binaries for cross compilation" + - because: "On RHEL-9.3.0 and newer, system binutils build extra binaries for cross compilation" when: distro == rhel-9.3.0 and collection is not defined test: "$WITH_SCL ./test-rhel-9.3.0.sh" - - because: "On RHEL-9, gcc-toolset-13 binutils build has extra directory levels" + - because: "On RHEL-9.3.0 and newer, system binutils build extra binaries for cross compilation" + when: distro == rhel-9.4.0 and collection is not defined + test: "$WITH_SCL ./test-rhel-9.3.0.sh" + + - because: "On RHEL-9.3.0 and newer, gcc-toolset-13 binutils build has extra directory levels" when: distro == rhel-9.3.0 and collection == gcc-toolset-13 test: "$WITH_SCL ./test-rhel-9.3.0.sh" environment+: CROSS_BINUTILS: "no" + - because: "On RHEL-9.3.0 and newer, gcc-toolset-13 binutils build has extra directory levels" + when: distro == rhel-9.4.0 and collection == gcc-toolset-13 + test: "$WITH_SCL ./test-rhel-9.3.0.sh" + environment+: + CROSS_BINUTILS: "no" + + - because: "On RHEL-8.10.0 and newer, system binutils build extra binaries for cross compilation" + when: distro == rhel-8.10.0 and collection is not defined + test: "$WITH_SCL ./test-rhel-9.3.0.sh" + environment+: + CROSS_BINUTILS: "no" + + - because: "On RHEL-8.10.0 and newer, gcc-toolset-13 binutils build has extra directory levels" + when: distro == rhel-8.10.0 and collection == gcc-toolset-13 + test: "$WITH_SCL ./test-rhel-9.3.0.sh" + environment+: + CROSS_BINUTILS: "no" + - because: "On CentOS Stream 9, system binutils build extra binaries for cross compilation" when: distro == centos-stream-9 and collection is not defined test: "$WITH_SCL ./test-rhel-9.3.0.sh"