tests: add llvm-toolset-14.0 requirements to tests and plans

This commit is contained in:
Jesus Checa Hidalgo 2022-04-25 10:46:35 +02:00
parent 6d38530d6f
commit 470fb734a0
5 changed files with 18 additions and 0 deletions

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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"