From 8d94b3d903b168025edc3f0ef4ab3be3938d6ac3 Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Wed, 26 Jan 2022 10:52:41 +0100
Subject: [PATCH] tests: test fixes for SCL-ized llvm-toolset-13 in RHEL-7

---
 tests/build-gating-libomp.fmf | 6 +++++-
 tests/build-gating.fmf        | 6 +++---
 tests/toolchains/main.fmf     | 1 +
 tests/toolchains/test.sh      | 3 ++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/build-gating-libomp.fmf b/tests/build-gating-libomp.fmf
index be680bc..cee2b83 100644
--- a/tests/build-gating-libomp.fmf
+++ b/tests/build-gating-libomp.fmf
@@ -6,6 +6,10 @@ adjust:
       and trigger != commit
       and trigger != build
     enabled: false
+  - because: "When testing SCL-ized LLVM, the collection must be enabled first"
+    environment+:
+      WITH_SCL: "scl enable llvm-toolset-13.0"
+    when: "collection == llvm-toolset-13.0"
 discover:
     how: fmf
     test: libomp
@@ -17,7 +21,7 @@ prepare:
     - name: Drop libomp
       how: shell
       script: |
-        dnf erase -y libomp libomp-devel clang clang-libs
+        yum erase -y libomp libomp-devel clang clang-libs
 provision:
   hardware:
     memory: ">= 4 GiB"
diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf
index 4de64ee..d769b47 100644
--- a/tests/build-gating.fmf
+++ b/tests/build-gating.fmf
@@ -21,7 +21,7 @@ adjust:
 
   - because: "When testing SCL-ized LLVM, the collection must be enabled first"
     environment+:
-      WITH_SCL: "scl enable llvm-toolset-13.0 rust-toolset-1.58"
+      WITH_SCL: "scl enable llvm-toolset-13.0"
     when: "collection == llvm-toolset-13.0"
 
   # Unfortunately, TMT does not support more declarative approach, we need to run commands on our own.
@@ -46,10 +46,10 @@ adjust:
     when: distro == rhel-7
 
 discover:
-    - name: Local tests
+    - name: clang-tests
       how: fmf
       filter: "tag:-not-in-default"
-    - name: "Upstream LLVM integration test suite"
+    - name: upstream-llvm-integration-testsuite
       how: fmf
       url: https://src.fedoraproject.org/rpms/llvm.git
       ref: rawhide
diff --git a/tests/toolchains/main.fmf b/tests/toolchains/main.fmf
index 04c784f..4b17466 100644
--- a/tests/toolchains/main.fmf
+++ b/tests/toolchains/main.fmf
@@ -3,6 +3,7 @@ summary: ""
 test: "$WITH_SCL ./test.sh"
 require:
   - glibc-static
+  - yum-utils
 adjust:
   # Common requirements when LLVM is not SCL-ized
   - require+:
diff --git a/tests/toolchains/test.sh b/tests/toolchains/test.sh
index bed2e3d..3c89447 100755
--- a/tests/toolchains/test.sh
+++ b/tests/toolchains/test.sh
@@ -57,7 +57,8 @@ test_toolchain() {
 }
 
 clang --version
-dnf info installed clang | grep ^Source
+# Repoquery is needed instead yum info for compatibility with RHEL-7
+repoquery -i --installed $(rpm -qf $(which clang)) | grep ^Source
 echo ""
 
 for compiler in clang clang++; do