Add llvm-toolset-15.0

2022-09-30 13:06:34 +02:00 · 2022-09-30 13:06:34 +02:00 · 3270f811ee
commit 3270f811ee
parent 8c35ab8755
5 changed files with 18 additions and 0 deletions
--- 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
--- 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
--- 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
--- 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
--- 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