From 6c276a4e21bf5d642e33d99d62732be654facf30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A1clav=20Kadl=C4=8D=C3=ADk?= Date: Thu, 18 Apr 2024 14:58:34 +0200 Subject: [PATCH] Un-break RHEL-10 --- tests/Sanity/test-m32-m64-options/runtest.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Sanity/test-m32-m64-options/runtest.sh b/tests/Sanity/test-m32-m64-options/runtest.sh index 48faeae..d77aa2d 100755 --- a/tests/Sanity/test-m32-m64-options/runtest.sh +++ b/tests/Sanity/test-m32-m64-options/runtest.sh @@ -77,10 +77,10 @@ for arch in $PRI_ARCH $SEC_ARCH; do # libquadmath-devel availability is extremely complicated if [[ -z "$TOOLSET" ]] && rlIsRHEL '<7'; then :; - elif [[ -z "$TOOLSET" ]] && rlIsRHEL 7 && [[ "$PRI_ARCH" != x86_64 ]]; then :; - elif [[ -z "$TOOLSET" ]] && rlIsRHEL 8 9 && [[ "$PRI_ARCH" != x86_64 ]] && [[ "$PRI_ARCH" != ppc64le ]]; then :; - elif [[ -n "$TOOLSET" ]] && rlIsRHEL 7 && [[ "$PRI_ARCH" = s390x ]]; then :; - elif [[ -n "$TOOLSET" ]] && rlIsRHEL 8 9 && [[ "$PRI_ARCH" != x86_64 ]] && [[ "$PRI_ARCH" != ppc64le ]]; then :; + elif [[ -z "$TOOLSET" ]] && rlIsRHEL 7 && [[ "$PRI_ARCH" != x86_64 ]]; then :; + elif [[ -z "$TOOLSET" ]] && rlIsRHEL 8 9 10 && [[ "$PRI_ARCH" != x86_64 ]] && [[ "$PRI_ARCH" != ppc64le ]]; then :; + elif [[ -n "$TOOLSET" ]] && rlIsRHEL 7 && [[ "$PRI_ARCH" = s390x ]]; then :; + elif [[ -n "$TOOLSET" ]] && rlIsRHEL 8 9 && [[ "$PRI_ARCH" != x86_64 ]] && [[ "$PRI_ARCH" != ppc64le ]]; then :; elif [[ -e /run/ostree-booted ]] && [[ "$arch" = i686 ]]; then :; else PACKAGES+=" ${GCC_RPM_NAME%%gcc}libquadmath-devel.$arch"