From b3d0caa90a8e7a4985665b4fda58038ec34da251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Tue, 21 May 2024 14:21:22 +0200 Subject: [PATCH] Support RHEL-9.5 --- tests/testsuite/main.fmf | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/tests/testsuite/main.fmf b/tests/testsuite/main.fmf index 29ab9a1..419b8fb 100644 --- a/tests/testsuite/main.fmf +++ b/tests/testsuite/main.fmf @@ -27,21 +27,11 @@ adjust+: test: "$WITH_SCL ./test-with-cross.sh" - because: "On RHEL-9.3.0 and newer, system binutils build extra binaries for cross compilation" - when: distro == rhel-9.3 and collection is not defined - test: "$WITH_SCL ./test-with-cross.sh" - - - because: "On RHEL-9.3.0 and newer, system binutils build extra binaries for cross compilation" - when: distro == rhel-9.4 and collection is not defined + when: distro >= rhel-9.3 and collection is not defined test: "$WITH_SCL ./test-with-cross.sh" - because: "On RHEL-9.3.0 and newer, gcc-toolset-13 binutils build has extra directory levels" - when: distro == rhel-9.3 and collection == gcc-toolset-13 - test: "$WITH_SCL ./test-with-cross.sh" - environment+: - MAY_BUILD_OTHER_ARCHES: "no" - - - because: "On RHEL-9.3.0 and newer, gcc-toolset-13 binutils build has extra directory levels" - when: distro == rhel-9.4 and collection == gcc-toolset-13 + when: distro >= rhel-9.3 and collection == gcc-toolset-13 test: "$WITH_SCL ./test-with-cross.sh" environment+: MAY_BUILD_OTHER_ARCHES: "no"