diff --git a/tests/Regression/603924-wrong-O0-g-debug-with-__builtin_alloca/runtest.sh b/tests/Regression/603924-wrong-O0-g-debug-with-__builtin_alloca/runtest.sh index 8f4871e..cf14f89 100755 --- a/tests/Regression/603924-wrong-O0-g-debug-with-__builtin_alloca/runtest.sh +++ b/tests/Regression/603924-wrong-O0-g-debug-with-__builtin_alloca/runtest.sh @@ -9,7 +9,13 @@ GCC="${GCC:-$(type -P gcc)}" GCC_RPM_NAME=$(rpm --qf '%{name}' -qf "$GCC") -PACKAGES="$GCC_RPM_NAME ${GCC_RPM_NAME%gcc}gdb" +if [[ "$GCC_RPM_NAME" == gcc-toolset-1[23]* ]] || rlIsRHEL '<9'; then + GDB_RPM_NAME=${GCC_RPM_NAME%gcc}gdb +else + # No GTS gdb in GTS 14+ on RHEL 9+ + GDB_RPM_NAME=gdb +fi +PACKAGES="$GCC_RPM_NAME $GDB_RPM_NAME" rlJournalStart rlPhaseStartSetup diff --git a/tests/Sanity/compile-rpm/runtest.sh b/tests/Sanity/compile-rpm/runtest.sh index fd86b2e..895fa22 100755 --- a/tests/Sanity/compile-rpm/runtest.sh +++ b/tests/Sanity/compile-rpm/runtest.sh @@ -8,7 +8,12 @@ GCC="${GCC:-$(type -P gcc)}" GCC_RPM_NAME=$(rpm --qf '%{name}' -qf "$GCC") -GDB_RPM_NAME=${GCC_RPM_NAME%gcc}gdb +if [[ "$GCC_RPM_NAME" == gcc-toolset-1[23]* ]] || rlIsRHEL '<9'; then + GDB_RPM_NAME=${GCC_RPM_NAME%gcc}gdb +else + # No GTS gdb in GTS 14+ on RHEL 9+ + GDB_RPM_NAME=gdb +fi PACKAGES="$GCC_RPM_NAME $GDB_RPM_NAME autoconf bison dejagnu elfutils-libelf-devel expat-devel flex gcc gdb glibc-devel grep libselinux-devel make mpfr-devel ncurses-devel readline-devel rpm-build rpm-devel texinfo xz-devel" diff --git a/tests/main.fmf b/tests/main.fmf index b67e10b..9428a10 100644 --- a/tests/main.fmf +++ b/tests/main.fmf @@ -101,6 +101,9 @@ adjust: - gcc-toolset-14-libubsan-devel - gcc-toolset-14-annobin-plugin-gcc - gcc-toolset-14-annobin-annocheck + - when: collection == gcc-toolset-14 and distro < rhel-9 + require+: + - gcc-toolset-14-gdb - when: collection == gcc-toolset-15 require+: - gcc-toolset-15-gcc @@ -120,6 +123,9 @@ adjust: - gcc-toolset-15-libubsan-devel - gcc-toolset-15-annobin-plugin-gcc - gcc-toolset-15-annobin-annocheck + - when: collection == gcc-toolset-15 and distro < rhel-9 + require+: + - gcc-toolset-15-gdb - when: collection == gcc-toolset-16 require+: - gcc-toolset-16-gcc @@ -139,6 +145,9 @@ adjust: - gcc-toolset-16-libubsan-devel - gcc-toolset-16-annobin-plugin-gcc - gcc-toolset-16-annobin-annocheck + - when: collection == gcc-toolset-16 and distro < rhel-9 + require+: + - gcc-toolset-16-gdb - when: collection == gcc-toolset-17 require+: - gcc-toolset-17-gcc @@ -158,6 +167,9 @@ adjust: - gcc-toolset-17-libubsan-devel - gcc-toolset-17-annobin-plugin-gcc - gcc-toolset-17-annobin-annocheck + - when: collection == gcc-toolset-17 and distro < rhel-9 + require+: + - gcc-toolset-17-gdb - when: collection == gcc-toolset-18 require+: - gcc-toolset-18-gcc @@ -177,6 +189,9 @@ adjust: - gcc-toolset-18-libubsan-devel - gcc-toolset-18-annobin-plugin-gcc - gcc-toolset-18-annobin-annocheck + - when: collection == gcc-toolset-18 and distro < rhel-9 + require+: + - gcc-toolset-18-gdb - when: collection == gcc-toolset-19 require+: - gcc-toolset-19-gcc @@ -196,3 +211,6 @@ adjust: - gcc-toolset-19-libubsan-devel - gcc-toolset-19-annobin-plugin-gcc - gcc-toolset-19-annobin-annocheck + - when: collection == gcc-toolset-19 and distro < rhel-9 + require+: + - gcc-toolset-19-gdb