tests: add llvm-toolset-14.0 requirements to tests and plans
This commit is contained in:
parent
a6af40e6f6
commit
965c7fbf2c
@ -23,6 +23,10 @@ adjust:
|
|||||||
environment+:
|
environment+:
|
||||||
WITH_SCL: "scl enable llvm-toolset-13.0 rust-toolset-1.58"
|
WITH_SCL: "scl enable llvm-toolset-13.0 rust-toolset-1.58"
|
||||||
when: "collection == 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 rust-toolset-1.62"
|
||||||
|
when: "collection == llvm-toolset-14.0"
|
||||||
|
|
||||||
# Unfortunatelly, TMT does not support more declarative approach, we need to run commands on our own.
|
# Unfortunatelly, TMT does not support more declarative approach, we need to run commands on our own.
|
||||||
- because: "On CentOS, CRB must be enabled to provide rarer packages"
|
- because: "On CentOS, CRB must be enabled to provide rarer packages"
|
||||||
|
@ -46,6 +46,19 @@ adjust:
|
|||||||
- llvm-toolset-13.0-llvm-devel
|
- llvm-toolset-13.0-llvm-devel
|
||||||
- llvm-toolset-13.0-python3-lit
|
- llvm-toolset-13.0-python3-lit
|
||||||
when: "collection == llvm-toolset-13.0"
|
when: "collection == llvm-toolset-13.0"
|
||||||
|
- require+:
|
||||||
|
- llvm-toolset-14.0-cmake
|
||||||
|
- llvm-toolset-14.0-clang
|
||||||
|
- llvm-toolset-14.0-clang-analyzer
|
||||||
|
- llvm-toolset-14.0-clang-devel
|
||||||
|
- llvm-toolset-14.0-clang-tools-extra
|
||||||
|
- llvm-toolset-14.0-compiler-rt
|
||||||
|
- llvm-toolset-14.0-lld
|
||||||
|
- llvm-toolset-14.0-lldb
|
||||||
|
- llvm-toolset-14.0-libomp-devel
|
||||||
|
- llvm-toolset-14.0-llvm-devel
|
||||||
|
- llvm-toolset-14.0-python3-lit
|
||||||
|
when: "collection == llvm-toolset-14.0"
|
||||||
|
|
||||||
# lld and libomp are not supported in s390x, remove them
|
# lld and libomp are not supported in s390x, remove them
|
||||||
- require-:
|
- require-:
|
||||||
@ -54,6 +67,12 @@ adjust:
|
|||||||
when: >-
|
when: >-
|
||||||
collection == llvm-toolset-13.0
|
collection == llvm-toolset-13.0
|
||||||
and arch == s390x
|
and arch == s390x
|
||||||
|
- require-:
|
||||||
|
- llvm-toolset-14.0-lld
|
||||||
|
- llvm-toolset-14.0-libomp-devel
|
||||||
|
when: >-
|
||||||
|
collection == llvm-toolset-14.0
|
||||||
|
and arch == s390x
|
||||||
|
|
||||||
# libcxx shall be required in Fedora, it's not shipped with RHEL.
|
# libcxx shall be required in Fedora, it's not shipped with RHEL.
|
||||||
- require+:
|
- require+:
|
||||||
|
@ -7,3 +7,7 @@ adjust:
|
|||||||
environment+:
|
environment+:
|
||||||
LIBLLVM_PATH: /opt/rh/llvm-toolset-13.0/root/usr/lib64/libLLVM.so
|
LIBLLVM_PATH: /opt/rh/llvm-toolset-13.0/root/usr/lib64/libLLVM.so
|
||||||
when: "collection == llvm-toolset-13.0"
|
when: "collection == llvm-toolset-13.0"
|
||||||
|
- because: "With SCL-ized LLVM, library path is different"
|
||||||
|
environment+:
|
||||||
|
LIBLLVM_PATH: /opt/rh/llvm-toolset-14.0/root/usr/lib64/libLLVM.so
|
||||||
|
when: "collection == llvm-toolset-14.0"
|
@ -24,3 +24,7 @@ adjust:
|
|||||||
- rust-toolset-1.58-cargo
|
- rust-toolset-1.58-cargo
|
||||||
- rust-toolset-1.58-rust
|
- rust-toolset-1.58-rust
|
||||||
when: "collection == llvm-toolset-13.0"
|
when: "collection == llvm-toolset-13.0"
|
||||||
|
- require+:
|
||||||
|
- rust-toolset-1.62-cargo
|
||||||
|
- rust-toolset-1.62-rust
|
||||||
|
when: "collection == llvm-toolset-14.0"
|
Loading…
Reference in New Issue
Block a user