diff --git a/tests/build-gating-libomp.fmf b/tests/build-gating-libomp.fmf index f33a598..1ddd29e 100644 --- a/tests/build-gating-libomp.fmf +++ b/tests/build-gating-libomp.fmf @@ -11,6 +11,10 @@ adjust: environment+: WITH_SCL: "scl enable llvm-toolset-13.0" 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" + when: "collection == llvm-toolset-14.0" - because: "libomp not supported in s390x" when: arch == s390x diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf index d769b47..554a83f 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" 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" + when: "collection == llvm-toolset-14.0" # Unfortunately, TMT does not support more declarative approach, we need to run commands on our own. - because: "On RHEL, CRB must be enabled to provide rarer packages" diff --git a/tests/clang-format-diff/main.fmf b/tests/clang-format-diff/main.fmf index 16bcfcc..06ed176 100644 --- a/tests/clang-format-diff/main.fmf +++ b/tests/clang-format-diff/main.fmf @@ -10,3 +10,6 @@ adjust: - require: - llvm-toolset-13.0-clang-tools-extra when: "collection == llvm-toolset-13.0" + - require: + - llvm-toolset-14.0-clang-tools-extra + when: "collection == llvm-toolset-14.0" diff --git a/tests/libomp/main.fmf b/tests/libomp/main.fmf index 230c118..960bccb 100644 --- a/tests/libomp/main.fmf +++ b/tests/libomp/main.fmf @@ -28,3 +28,9 @@ adjust: - llvm-toolset-13.0-libomp - llvm-toolset-13.0-libomp-devel when: "collection == llvm-toolset-13.0" + - require: + - llvm-toolset-14.0-clang + - llvm-toolset-14.0-clang-libs + - llvm-toolset-14.0-libomp + - llvm-toolset-14.0-libomp-devel + when: "collection == llvm-toolset-14.0" \ No newline at end of file diff --git a/tests/rhbz_1647130/main.fmf b/tests/rhbz_1647130/main.fmf index 53a4d0c..3445a1b 100644 --- a/tests/rhbz_1647130/main.fmf +++ b/tests/rhbz_1647130/main.fmf @@ -13,3 +13,7 @@ adjust: - llvm-toolset-13.0-clang - llvm-toolset-13.0-clang-analyzer when: "collection == llvm-toolset-13.0" + - require+: + - llvm-toolset-14.0-clang + - llvm-toolset-14.0-clang-analyzer + when: "collection == llvm-toolset-14.0" \ No newline at end of file diff --git a/tests/rhbz_1657544/main.fmf b/tests/rhbz_1657544/main.fmf index 3e7b320..a775439 100644 --- a/tests/rhbz_1657544/main.fmf +++ b/tests/rhbz_1657544/main.fmf @@ -11,3 +11,6 @@ adjust: - require+: - llvm-toolset-13.0-clang when: "collection == llvm-toolset-13.0" + - require+: + - llvm-toolset-14.0-clang + when: "collection == llvm-toolset-14.0" diff --git a/tests/rhbz_482491/main.fmf b/tests/rhbz_482491/main.fmf index a2f8800..f0929e9 100644 --- a/tests/rhbz_482491/main.fmf +++ b/tests/rhbz_482491/main.fmf @@ -12,3 +12,6 @@ adjust: - require+: - llvm-toolset-13.0-clang when: "collection == llvm-toolset-13.0" + - require+: + - llvm-toolset-14.0-clang + when: "collection == llvm-toolset-14.0" \ No newline at end of file diff --git a/tests/toolchains/main.fmf b/tests/toolchains/main.fmf index 8f6907e..f6506e6 100644 --- a/tests/toolchains/main.fmf +++ b/tests/toolchains/main.fmf @@ -26,6 +26,14 @@ adjust: - 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" + - require-: + - llvm-toolset-14.0-lld + when: collection == llvm-toolset-14.0 and arch == s390x - environment+: CXXLIBS: "libc++"