diff --git a/basic/main.fmf b/basic/main.fmf index b97eb59..f4d96e0 100644 --- a/basic/main.fmf +++ b/basic/main.fmf @@ -30,3 +30,7 @@ adjust: - llvm-toolset-14.0-clang - llvm-toolset-14.0-lld when: collection == llvm-toolset-14.0 + - require+: + - llvm-toolset-15.0-clang + - llvm-toolset-15.0-lld + when: collection == llvm-toolset-15.0 diff --git a/build-gating-alternatives.fmf b/build-gating-alternatives.fmf index 9ca8c6d..0d52a79 100644 --- a/build-gating-alternatives.fmf +++ b/build-gating-alternatives.fmf @@ -31,6 +31,10 @@ adjust: environment+: WITH_SCL: "scl enable llvm-toolset-14.0" when: "collection == llvm-toolset-14.0" + - because: "When testing SCL-ized LLVM, the collection must be enabled first" + environment+: + WITH_SCL: "scl enable llvm-toolset-15.0" + when: "collection == llvm-toolset-15.0" discover: - name: lld-tests diff --git a/build-gating.fmf b/build-gating.fmf index b22513f..e67f5a8 100644 --- a/build-gating.fmf +++ b/build-gating.fmf @@ -31,6 +31,10 @@ adjust: environment+: WITH_SCL: "scl enable llvm-toolset-14.0" when: "collection == llvm-toolset-14.0" + - because: "When testing SCL-ized LLVM, the collection must be enabled first" + environment+: + WITH_SCL: "scl enable llvm-toolset-15.0" + when: "collection == llvm-toolset-15.0" discover: - name: lld-tests diff --git a/gcc-compat-basic/main.fmf b/gcc-compat-basic/main.fmf index c964a6f..f2abfd2 100644 --- a/gcc-compat-basic/main.fmf +++ b/gcc-compat-basic/main.fmf @@ -32,3 +32,6 @@ adjust: - require+: - llvm-toolset-14.0-lld when: collection == llvm-toolset-14.0 + - require+: + - llvm-toolset-15.0-lld + when: collection == llvm-toolset-15.0 diff --git a/ld-alternative/main.fmf b/ld-alternative/main.fmf index 4cdfcf7..382ed4e 100644 --- a/ld-alternative/main.fmf +++ b/ld-alternative/main.fmf @@ -35,3 +35,6 @@ adjust: - require+: - llvm-toolset-14.0-lld when: collection == llvm-toolset-14.0 + - require+: + - llvm-toolset-15.0-lld + when: collection == llvm-toolset-15.0