From 56439f652130bda1f3738d5ed1437fe97709f324 Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Fri, 11 Feb 2022 12:24:17 +0100
Subject: [PATCH] tests: fix llvm-toolchain and toolchains test requirements
 for centos and rhel

---
 tests/llvm-toolchain/main.fmf |  4 +++-
 tests/toolchains/main.fmf     | 12 +++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/llvm-toolchain/main.fmf b/tests/llvm-toolchain/main.fmf
index 5923b64..b8542b0 100644
--- a/tests/llvm-toolchain/main.fmf
+++ b/tests/llvm-toolchain/main.fmf
@@ -32,5 +32,7 @@ adjust:
       CXXLIB: "libstdc++"
     require:
       - libstdc++
-    when: "distro == rhel"
+    when: >-
+      distro == rhel
+      or distro == centos
     because: testing against libstdc++ package in RHEL as libcxx is not shipped with RHEL
diff --git a/tests/toolchains/main.fmf b/tests/toolchains/main.fmf
index 34daf26..04c784f 100644
--- a/tests/toolchains/main.fmf
+++ b/tests/toolchains/main.fmf
@@ -1,6 +1,8 @@
 # TODO REVIEW: better summary
 summary: ""
 test: "$WITH_SCL ./test.sh"
+require:
+  - glibc-static
 adjust:
   # Common requirements when LLVM is not SCL-ized
   - require+:
@@ -14,19 +16,19 @@ adjust:
 
   - environment+:
       CXXLIBS: "libc++"
-    require:
+    require+:
       - libcxx-devel
     when: "distro == fedora"
     because: testing against libcxx package in Fedora
 
   - environment+:
       CXXLIBS: "libstdc++"
-    require:
+    require+:
       - libstdc++
-    when: "distro == rhel"
+    when: >-
+      distro == rhel
+      or distro == centos
     because: testing against libstdc++ package in RHEL as libcxx is not shipped with RHEL
 
 # TODO REVIEW: are these all requirements? test.sh seems to run quite a lot of stuff, looks like we
 # need more packages from LLVM family.
-require:
-  - glibc-static