From 965c7fbf2cca744bcebf8f7e87985b8aea681b61 Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Fri, 22 Apr 2022 13:04:50 +0200
Subject: [PATCH] tests: add llvm-toolset-14.0 requirements to tests and plans

---
 tests/build-gating.fmf                |  4 ++++
 tests/integration-test-suite/main.fmf | 19 +++++++++++++++++++
 tests/libllvm-size/main.fmf           |  4 ++++
 tests/rust-sanity/main.fmf            |  4 ++++
 4 files changed, 31 insertions(+)

diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf
index 8b0b0b3..3d80af0 100644
--- a/tests/build-gating.fmf
+++ b/tests/build-gating.fmf
@@ -23,6 +23,10 @@ adjust:
     environment+:
       WITH_SCL: "scl enable llvm-toolset-13.0 rust-toolset-1.58"
     when: "collection == llvm-toolset-13.0"
+  - because: "When testing SCL-ized LLVM, the collection must be enabled first"
+    environment+:
+      WITH_SCL: "scl enable llvm-toolset-14.0 rust-toolset-1.62"
+    when: "collection == llvm-toolset-14.0"
 
   # Unfortunatelly, TMT does not support more declarative approach, we need to run commands on our own.
   - because: "On CentOS, CRB must be enabled to provide rarer packages"
diff --git a/tests/integration-test-suite/main.fmf b/tests/integration-test-suite/main.fmf
index 8130e69..e928ad9 100644
--- a/tests/integration-test-suite/main.fmf
+++ b/tests/integration-test-suite/main.fmf
@@ -46,6 +46,19 @@ adjust:
       - llvm-toolset-13.0-llvm-devel
       - llvm-toolset-13.0-python3-lit
     when: "collection == llvm-toolset-13.0"
+  - require+:
+      - llvm-toolset-14.0-cmake
+      - llvm-toolset-14.0-clang
+      - llvm-toolset-14.0-clang-analyzer
+      - llvm-toolset-14.0-clang-devel
+      - llvm-toolset-14.0-clang-tools-extra
+      - llvm-toolset-14.0-compiler-rt
+      - llvm-toolset-14.0-lld
+      - llvm-toolset-14.0-lldb
+      - llvm-toolset-14.0-libomp-devel
+      - llvm-toolset-14.0-llvm-devel
+      - llvm-toolset-14.0-python3-lit
+    when: "collection == llvm-toolset-14.0"
 
   # lld and libomp are not supported in s390x, remove them
   - require-:
@@ -54,6 +67,12 @@ adjust:
     when: >-
       collection == llvm-toolset-13.0
       and arch == s390x
+  - require-:
+      - llvm-toolset-14.0-lld
+      - llvm-toolset-14.0-libomp-devel
+    when: >-
+      collection == llvm-toolset-14.0
+      and arch == s390x
 
   # libcxx shall be required in Fedora, it's not shipped with RHEL.
   - require+:
diff --git a/tests/libllvm-size/main.fmf b/tests/libllvm-size/main.fmf
index cab01ae..2c207dd 100644
--- a/tests/libllvm-size/main.fmf
+++ b/tests/libllvm-size/main.fmf
@@ -7,3 +7,7 @@ adjust:
     environment+:
       LIBLLVM_PATH: /opt/rh/llvm-toolset-13.0/root/usr/lib64/libLLVM.so
     when: "collection == llvm-toolset-13.0"
+  - because: "With SCL-ized LLVM, library path is different"
+    environment+:
+      LIBLLVM_PATH: /opt/rh/llvm-toolset-14.0/root/usr/lib64/libLLVM.so
+    when: "collection == llvm-toolset-14.0"
\ No newline at end of file
diff --git a/tests/rust-sanity/main.fmf b/tests/rust-sanity/main.fmf
index 8a21dbd..d7b316e 100644
--- a/tests/rust-sanity/main.fmf
+++ b/tests/rust-sanity/main.fmf
@@ -24,3 +24,7 @@ adjust:
       - rust-toolset-1.58-cargo
       - rust-toolset-1.58-rust
     when: "collection == llvm-toolset-13.0"
+  - require+:
+      - rust-toolset-1.62-cargo
+      - rust-toolset-1.62-rust
+    when: "collection == llvm-toolset-14.0"
\ No newline at end of file