diff --git a/tests/basic/main.fmf b/tests/basic/main.fmf index 34fd478..3b55bc7 100644 --- a/tests/basic/main.fmf +++ b/tests/basic/main.fmf @@ -17,3 +17,7 @@ adjust: - llvm-toolset-13.0-clang - llvm-toolset-13.0-lld when: "collection == llvm-toolset-13.0" + - require+: + - llvm-toolset-14.0-clang + - llvm-toolset-14.0-lld + when: "collection == llvm-toolset-14.0" diff --git a/tests/build-gating-alternatives.fmf b/tests/build-gating-alternatives.fmf index 24a582d..36de76c 100644 --- a/tests/build-gating-alternatives.fmf +++ b/tests/build-gating-alternatives.fmf @@ -27,6 +27,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" discover: - name: lld-tests diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf index 60ada75..44f9fab 100644 --- a/tests/build-gating.fmf +++ b/tests/build-gating.fmf @@ -27,6 +27,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" discover: - name: lld-tests diff --git a/tests/gcc-compat-basic/main.fmf b/tests/gcc-compat-basic/main.fmf index 85beb9a..11263c9 100644 --- a/tests/gcc-compat-basic/main.fmf +++ b/tests/gcc-compat-basic/main.fmf @@ -16,3 +16,6 @@ adjust: - require+: - llvm-toolset-13.0-lld when: "collection == llvm-toolset-13.0" + - require+: + - llvm-toolset-14.0-lld + when: "collection == llvm-toolset-14.0" diff --git a/tests/ld-alternative/main.fmf b/tests/ld-alternative/main.fmf index 7234656..a5f2646 100644 --- a/tests/ld-alternative/main.fmf +++ b/tests/ld-alternative/main.fmf @@ -19,3 +19,6 @@ adjust: - require+: - llvm-toolset-13.0-lld when: "collection == llvm-toolset-13.0" + - require+: + - llvm-toolset-14.0-lld + when: "collection == llvm-toolset-14.0"