diff --git a/plans/build-gating.fmf b/plans/build-gating.fmf index c2792b6..4910441 100644 --- a/plans/build-gating.fmf +++ b/plans/build-gating.fmf @@ -19,12 +19,26 @@ adjust+: and trigger != build enabled: false + - because: "On CentOS Stream 10, CRB repository must be enabled for various BuildRequires" + when: distro == centos-stream-10 + prepare+: + - how: shell + script: dnf config-manager --set-enabled crb + - because: "On CentOS Stream 9, CRB repository must be enabled for various BuildRequires" when: distro == centos-stream-9 prepare+: - how: shell script: dnf config-manager --set-enabled crb + - because: "On RHEL-10, CRB and buildroot repositories must be enabled for various BuildRequires" + when: distro == rhel-10 + prepare+: + - how: shell + script: + - dnf config-manager --set-enabled rhel-CRB + - dnf config-manager --set-enabled rhel-buildroot + - because: "On RHEL-9, CRB and buildroot repositories must be enabled for various BuildRequires" when: distro == rhel-9 prepare+: diff --git a/tests/bugs/when-mistaking-argument-of-strings/test.sh b/tests/bugs/when-mistaking-argument-of-strings/test.sh index b2ebef1..aa02bb9 100755 --- a/tests/bugs/when-mistaking-argument-of-strings/test.sh +++ b/tests/bugs/when-mistaking-argument-of-strings/test.sh @@ -43,6 +43,10 @@ rlJournalStart rlRun "strings -n 0 2>&1 | tee output" if rlIsFedora "> 39"; then rlAssertGrep "minimum string length is too small: 0" output + + elif rlIsCentOS ">= 10"; then + rlAssertGrep "minimum string length is too small: 0" output + else rlAssertGrep "invalid minimum string length 0" output fi @@ -52,6 +56,10 @@ rlJournalStart rlRun "strings --bytes 0 2>&1 | tee output" if rlIsFedora "> 39"; then rlAssertGrep "minimum string length is too small: 0" output + + elif rlIsCentOS ">= 10"; then + rlAssertGrep "minimum string length is too small: 0" output + else rlAssertGrep "invalid minimum string length 0" output fi diff --git a/tests/main.fmf b/tests/main.fmf index 5baf010..ed55d84 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -77,6 +77,23 @@ adjust+: # * `COLLECTION_PACKAGES` lists other binutils packages in the collection # + # RHEL-10 / no collection + - when: distro == rhel-10 and collection is not defined + require+: + - binutils + - binutils-devel + - binutils-gold + - glibc + - gcc + - gcc-c++ + - annobin-annocheck + - annobin-plugin-gcc + environment+: + PACKAGES: binutils + _REQUIRES: gcc gcc-c++ glibc annobin-annocheck annobin-plugin-gcc + BINUTILS_PACKAGE: binutils + GCC_PACKAGE: gcc + # RHEL-9 / no collection - when: distro == rhel-9 and collection is not defined require+: @@ -258,6 +275,24 @@ adjust+: # RHEL-7 / devtoolset-12 # RHEL-7 / devtoolset-11 + # CentOS Stream 10 / no collection + - when: distro == centos-stream-10 and collection is not defined + require+: + - binutils + - binutils-devel + - binutils-gold + - gcc + - gcc-c++ + # TODO: CentOS Stream 10 + # - annobin + environment+: + PACKAGES: binutils + # TODO: CentOS Stream 10 + # _REQUIRES: gcc gcc-c++ glibc annobin + _REQUIRES: gcc gcc-c++ glibc + BINUTILS_PACKAGE: binutils + GCC_PACKAGE: gcc + # CentOS Stream 9 / no collection - when: distro == centos-stream-9 and collection is not defined require+: diff --git a/tests/rebuilds/wget/main.fmf b/tests/rebuilds/wget/main.fmf index a7ef164..029c188 100644 --- a/tests/rebuilds/wget/main.fmf +++ b/tests/rebuilds/wget/main.fmf @@ -13,6 +13,22 @@ environment+: REQUIRES: "wget" adjust+: + - when: distro >= rhel-10 + require+: + - wget2 + + environment+: + WGET_PACKAGE: "wget2" + REQUIRES: "wget2" + + - when: distro >= centos-stream-10 + require+: + - wget2 + + environment+: + WGET_PACKAGE: "wget2" + REQUIRES: "wget2" + - when: distro >= fedora-39 require+: - wget2 diff --git a/tests/supported-targets/10_aarch64_arch b/tests/supported-targets/10_aarch64_arch new file mode 100644 index 0000000..40eb53d --- /dev/null +++ b/tests/supported-targets/10_aarch64_arch @@ -0,0 +1,16 @@ +aarch64 +arm +armv2 +armv2a +armv3 +armv3m +armv4 +armv4t +armv5 +armv5t +armv5te +xscale +ep9312 +iwmmxt +iwmmxt2 +plugin diff --git a/tests/supported-targets/10_aarch64_tgt b/tests/supported-targets/10_aarch64_tgt new file mode 100644 index 0000000..f587143 --- /dev/null +++ b/tests/supported-targets/10_aarch64_tgt @@ -0,0 +1,15 @@ +elf64-littleaarch64 +elf64-bigaarch64 +elf32-littlearm +elf32-bigarm +elf64-little +elf64-big +elf32-little +elf32-big +plugin +srec +symbolsrec +verilog +tekhex +binary +ihex diff --git a/tests/supported-targets/10_ppc64_arch b/tests/supported-targets/10_ppc64_arch new file mode 100644 index 0000000..cf3789b --- /dev/null +++ b/tests/supported-targets/10_ppc64_arch @@ -0,0 +1,27 @@ +rs6000:6000 +rs6000:rs1 +rs6000:rsc +rs6000:rs2 +powerpc:common64 +powerpc:common +powerpc:603 +powerpc:EC603e +powerpc:604 +powerpc:403 +powerpc:601 +powerpc:620 +powerpc:630 +powerpc:a35 +powerpc:rs64ii +powerpc:rs64iii +powerpc:7400 +powerpc:e500 +powerpc:e500mc +powerpc:e500mc64 +powerpc:MPC8XX +powerpc:750 +powerpc:titan +powerpc:vle +powerpc:e5500 +powerpc:e6500 +plugin diff --git a/tests/supported-targets/10_ppc64_tgt b/tests/supported-targets/10_ppc64_tgt new file mode 100644 index 0000000..19faa60 --- /dev/null +++ b/tests/supported-targets/10_ppc64_tgt @@ -0,0 +1,18 @@ +elf64-powerpc +elf64-powerpcle +elf32-powerpc +elf32-powerpcle +aixcoff-rs6000 +aixcoff64-rs6000 +aix5coff64-rs6000 +elf64-little +elf64-big +elf32-little +elf32-big +plugin +srec +symbolsrec +verilog +tekhex +binary +ihex diff --git a/tests/supported-targets/10_ppc64le_arch b/tests/supported-targets/10_ppc64le_arch new file mode 100644 index 0000000..cf3789b --- /dev/null +++ b/tests/supported-targets/10_ppc64le_arch @@ -0,0 +1,27 @@ +rs6000:6000 +rs6000:rs1 +rs6000:rsc +rs6000:rs2 +powerpc:common64 +powerpc:common +powerpc:603 +powerpc:EC603e +powerpc:604 +powerpc:403 +powerpc:601 +powerpc:620 +powerpc:630 +powerpc:a35 +powerpc:rs64ii +powerpc:rs64iii +powerpc:7400 +powerpc:e500 +powerpc:e500mc +powerpc:e500mc64 +powerpc:MPC8XX +powerpc:750 +powerpc:titan +powerpc:vle +powerpc:e5500 +powerpc:e6500 +plugin diff --git a/tests/supported-targets/10_ppc64le_tgt b/tests/supported-targets/10_ppc64le_tgt new file mode 100644 index 0000000..40dd3f9 --- /dev/null +++ b/tests/supported-targets/10_ppc64le_tgt @@ -0,0 +1,19 @@ +elf64-powerpcle +elf64-powerpc +elf32-powerpcle +elf32-powerpc +aixcoff-rs6000 +aixcoff64-rs6000 +aix5coff64-rs6000 +elf64-little +elf64-big +elf32-little +elf32-big +ppcboot +plugin +srec +symbolsrec +verilog +tekhex +binary +ihex diff --git a/tests/supported-targets/10_s390x_arch b/tests/supported-targets/10_s390x_arch new file mode 100644 index 0000000..1dcd6fa --- /dev/null +++ b/tests/supported-targets/10_s390x_arch @@ -0,0 +1,3 @@ +s390:31-bit +s390:64-bit +plugin diff --git a/tests/supported-targets/10_s390x_tgt b/tests/supported-targets/10_s390x_tgt new file mode 100644 index 0000000..34a9dfd --- /dev/null +++ b/tests/supported-targets/10_s390x_tgt @@ -0,0 +1,14 @@ +elf64-s390 +elf32-s390 +elf64-little +elf64-big +elf32-little +elf32-big +plugin +srec +symbolsrec +verilog +tekhex +binary +ihex +trad-core diff --git a/tests/supported-targets/10_x86_64_arch b/tests/supported-targets/10_x86_64_arch new file mode 100644 index 0000000..b2cf7d6 --- /dev/null +++ b/tests/supported-targets/10_x86_64_arch @@ -0,0 +1,12 @@ +i386 +i386:x86-64 +i386:x64-32 +i8086 +i386:intel +i386:x86-64:intel +i386:x64-32:intel +l1om +l1om:intel +k1om +k1om:intel +plugin diff --git a/tests/supported-targets/10_x86_64_tgt b/tests/supported-targets/10_x86_64_tgt new file mode 100644 index 0000000..76f6081 --- /dev/null +++ b/tests/supported-targets/10_x86_64_tgt @@ -0,0 +1,19 @@ +elf64-x86-64 +elf32-i386 +elf32-x86-64 +a.out-i386-linux +pei-i386 +pei-x86-64 +elf64-l1om +elf64-k1om +elf64-little +elf64-big +elf32-little +elf32-big +plugin +srec +symbolsrec +verilog +tekhex +binary +ihex diff --git a/tests/supported-targets/test.sh b/tests/supported-targets/test.sh index f3b0f55..f5ca0a3 100755 --- a/tests/supported-targets/test.sh +++ b/tests/supported-targets/test.sh @@ -49,6 +49,8 @@ rlJournalStart release=8 elif rlIsCentOS "=9"; then release=9 + elif rlIsCentOS "=10"; then + release=10 elif rlIsFedora ">= 40"; then release=fedora_40 else