From 12f649bbd73c8d3060d81a3b0733f9b0f0c20c11 Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Mon, 14 Feb 2022 15:06:13 +0100
Subject: [PATCH] tests: Add all missing requirements for tests/toolchains

---
 tests/toolchains/main.fmf | 13 +++++++++++++
 tests/toolchains/test.sh  |  5 +++++
 2 files changed, 18 insertions(+)

diff --git a/tests/toolchains/main.fmf b/tests/toolchains/main.fmf
index 4b17466..8f6907e 100644
--- a/tests/toolchains/main.fmf
+++ b/tests/toolchains/main.fmf
@@ -4,21 +4,34 @@ test: "$WITH_SCL ./test.sh"
 require:
   - glibc-static
   - yum-utils
+  # This require EPEL/CRB to be enabled on RHEL
+  - libstdc++-static
 adjust:
   # Common requirements when LLVM is not SCL-ized
   - require+:
       - clang
+      - compiler-rt
+      - lld
     when: "collection is not defined"
+  - require-:
+      - lld
+    when: collection is not defined and arch == s390x
 
   # Requirements for SCL-ized LLVM
   - require+:
       - llvm-toolset-13.0-clang
+      - 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
 
   - environment+:
       CXXLIBS: "libc++"
     require+:
       - libcxx-devel
+      - libcxx-static
     when: "distro == fedora"
     because: testing against libcxx package in Fedora
 
diff --git a/tests/toolchains/test.sh b/tests/toolchains/test.sh
index 3c89447..ff8b1e2 100755
--- a/tests/toolchains/test.sh
+++ b/tests/toolchains/test.sh
@@ -80,6 +80,11 @@ for compiler in clang clang++; do
                       args="$args -pthread"
                     fi
 
+                    # lld is not supported in s390x
+                    if [[ "$(uname -m)" = "s390x" && "$linker" = "lld" ]]; then
+                      continue
+                    fi
+
                     test_toolchain $compiler $rtlib $linker $cxxlib $args
                 done
             done