Better naming of cross-binutils test suite files

This commit is contained in:
Miloš Prchlík 2023-10-16 16:34:03 +02:00
commit 6eeb9ad9fc
2 changed files with 26 additions and 14 deletions

View file

@ -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"

View file

@ -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