From 6eeb9ad9fc5176706949e5104ad7141a05a4e35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Prchl=C3=ADk?= Date: Mon, 16 Oct 2023 16:34:03 +0200 Subject: [PATCH] Better naming of cross-binutils test suite files --- tests/testsuite/main.fmf | 34 +++++++++++++------ ...{test-rhel-9.3.0.sh => test-with-cross.sh} | 6 ++-- 2 files changed, 26 insertions(+), 14 deletions(-) rename tests/testsuite/{test-rhel-9.3.0.sh => test-with-cross.sh} (95%) diff --git a/tests/testsuite/main.fmf b/tests/testsuite/main.fmf index 378f0b5..4a6eb05 100644 --- a/tests/testsuite/main.fmf +++ b/tests/testsuite/main.fmf @@ -20,36 +20,48 @@ require+: adjust+: - 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-rhel-9.3.0.sh" + 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 - test: "$WITH_SCL ./test-rhel-9.3.0.sh" + 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-rhel-9.3.0.sh" + test: "$WITH_SCL ./test-with-cross.sh" environment+: - CROSS_BINUTILS: "no" + 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 - test: "$WITH_SCL ./test-rhel-9.3.0.sh" + test: "$WITH_SCL ./test-with-cross.sh" environment+: - CROSS_BINUTILS: "no" + MAY_BUILD_OTHER_ARCHES: "no" - because: "On RHEL-8.10.0 and newer, system binutils build extra binaries for cross compilation" when: distro == rhel-8.10 and collection is not defined - test: "$WITH_SCL ./test-rhel-9.3.0.sh" + test: "$WITH_SCL ./test-with-cross.sh" environment+: - CROSS_BINUTILS: "no" + MAY_BUILD_OTHER_ARCHES: "no" - because: "On RHEL-8.10.0 and newer, gcc-toolset-13 binutils build has extra directory levels" when: distro == rhel-8.10 and collection == gcc-toolset-13 - test: "$WITH_SCL ./test-rhel-9.3.0.sh" + test: "$WITH_SCL ./test-with-cross.sh" environment+: - CROSS_BINUTILS: "no" + MAY_BUILD_OTHER_ARCHES: "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" + test: "$WITH_SCL ./test-with-cross.sh" + + - because: "On Fedora 39 and newer, system binutils build extra binaries for cross compilation" + when: distro == fedora-rawhide + test: "$WITH_SCL ./test-with-cross.sh" + environment+: + MAY_BUILD_OTHER_ARCHES: "no" + + - because: "On Fedora 39 and newer, system binutils build extra binaries for cross compilation" + when: distro == fedora-39 + test: "$WITH_SCL ./test-with-cross.sh" + environment+: + MAY_BUILD_OTHER_ARCHES: "no" diff --git a/tests/testsuite/test-rhel-9.3.0.sh b/tests/testsuite/test-with-cross.sh similarity index 95% rename from tests/testsuite/test-rhel-9.3.0.sh rename to tests/testsuite/test-with-cross.sh index a73401d..1e3437e 100755 --- a/tests/testsuite/test-rhel-9.3.0.sh +++ b/tests/testsuite/test-with-cross.sh @@ -37,9 +37,9 @@ rlJournalStart buTestHeader ARCH="$(rlGetPrimaryArch)" - CROSS_BINUTILS="${CROSS_BINUTILS:-yes}" + MAY_BUILD_OTHER_ARCHES="${MAY_BUILD_OTHER_ARCHES:-yes}" - if [ "$CROSS_BINUTILS" = "yes" ]; then + if [ "$MAY_BUILD_OTHER_ARCHES" = "yes" ]; then if [ "$ARCH" = "x86_64" ]; then BUILD_ARCHS="aarch64 ppc64le s390x x86_64" else @@ -51,7 +51,7 @@ rlJournalStart rlLogInfo "ARCH=$ARCH" rlLogInfo "BUILD_ARCHS=$BUILD_ARCHS" - rlLogInfo "CROSS_BINUTILS=$CROSS_BINUTILS" + rlLogInfo "MAY_BUILD_OTHER_ARCHES=$MAY_BUILD_OTHER_ARCHES" buEnterTmpDir