From 4ae8585417c9a9509c92181a2994b9a61178aeef Mon Sep 17 00:00:00 2001 From: Jesus Checa Hidalgo Date: Fri, 29 Apr 2022 16:34:23 +0200 Subject: [PATCH] tests: fix lld unavailability in ppc64 for toolchains tests --- tests/toolchains/main.fmf | 13 ++++++------- tests/toolchains/test.sh | 6 ++++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/toolchains/main.fmf b/tests/toolchains/main.fmf index f6506e6..9b8975b 100644 --- a/tests/toolchains/main.fmf +++ b/tests/toolchains/main.fmf @@ -13,9 +13,6 @@ adjust: - compiler-rt - lld when: "collection is not defined" - - require-: - - lld - when: collection is not defined and arch == s390x # Requirements for SCL-ized LLVM - require+: @@ -23,17 +20,19 @@ adjust: - llvm-toolset-13.0-compiler-rt - llvm-toolset-13.0-lld when: "collection == llvm-toolset-13.0" - - require-: - - llvm-toolset-13.0-lld - when: collection == llvm-toolset-13.0 and arch == s390x - require+: - llvm-toolset-14.0-clang - llvm-toolset-14.0-compiler-rt - llvm-toolset-14.0-lld when: "collection == llvm-toolset-14.0" + + # lld not supported in s390x or ppc64. If any lld package was added to + # requirements, remove it. - require-: + - lld + - llvm-toolset-13.0-lld - llvm-toolset-14.0-lld - when: collection == llvm-toolset-14.0 and arch == s390x + when: arch == s390x or arch == ppc64 - environment+: CXXLIBS: "libc++" diff --git a/tests/toolchains/test.sh b/tests/toolchains/test.sh index b481961..65594e6 100755 --- a/tests/toolchains/test.sh +++ b/tests/toolchains/test.sh @@ -80,8 +80,10 @@ for compiler in clang clang++; do args="$args -pthread" fi - # lld is not supported in s390x - if [[ "$(uname -m)" = "s390x" && "$linker" = "lld" ]]; then + # lld is not supported in s390x and ppc64 + if [[ "$(uname -m)" = "s390x" || "$(uname -m)" = "ppc64" ]] \ + && [[ "$linker" = "lld" ]]; + then continue fi