tests: test fixes for SCL-ized llvm-toolset-13 in RHEL-7

This commit is contained in:
Jesus Checa Hidalgo 2022-01-26 10:52:41 +01:00
parent 9e607ef75e
commit 8d94b3d903
4 changed files with 11 additions and 5 deletions

View File

@ -6,6 +6,10 @@ adjust:
and trigger != commit and trigger != commit
and trigger != build and trigger != build
enabled: false enabled: false
- because: "When testing SCL-ized LLVM, the collection must be enabled first"
environment+:
WITH_SCL: "scl enable llvm-toolset-13.0"
when: "collection == llvm-toolset-13.0"
discover: discover:
how: fmf how: fmf
test: libomp test: libomp
@ -17,7 +21,7 @@ prepare:
- name: Drop libomp - name: Drop libomp
how: shell how: shell
script: | script: |
dnf erase -y libomp libomp-devel clang clang-libs yum erase -y libomp libomp-devel clang clang-libs
provision: provision:
hardware: hardware:
memory: ">= 4 GiB" memory: ">= 4 GiB"

View File

@ -21,7 +21,7 @@ adjust:
- because: "When testing SCL-ized LLVM, the collection must be enabled first" - because: "When testing SCL-ized LLVM, the collection must be enabled first"
environment+: environment+:
WITH_SCL: "scl enable llvm-toolset-13.0 rust-toolset-1.58" WITH_SCL: "scl enable llvm-toolset-13.0"
when: "collection == llvm-toolset-13.0" when: "collection == llvm-toolset-13.0"
# Unfortunately, TMT does not support more declarative approach, we need to run commands on our own. # Unfortunately, TMT does not support more declarative approach, we need to run commands on our own.
@ -46,10 +46,10 @@ adjust:
when: distro == rhel-7 when: distro == rhel-7
discover: discover:
- name: Local tests - name: clang-tests
how: fmf how: fmf
filter: "tag:-not-in-default" filter: "tag:-not-in-default"
- name: "Upstream LLVM integration test suite" - name: upstream-llvm-integration-testsuite
how: fmf how: fmf
url: https://src.fedoraproject.org/rpms/llvm.git url: https://src.fedoraproject.org/rpms/llvm.git
ref: rawhide ref: rawhide

View File

@ -3,6 +3,7 @@ summary: ""
test: "$WITH_SCL ./test.sh" test: "$WITH_SCL ./test.sh"
require: require:
- glibc-static - glibc-static
- yum-utils
adjust: adjust:
# Common requirements when LLVM is not SCL-ized # Common requirements when LLVM is not SCL-ized
- require+: - require+:

View File

@ -57,7 +57,8 @@ test_toolchain() {
} }
clang --version clang --version
dnf info installed clang | grep ^Source # Repoquery is needed instead yum info for compatibility with RHEL-7
repoquery -i --installed $(rpm -qf $(which clang)) | grep ^Source
echo "" echo ""
for compiler in clang clang++; do for compiler in clang clang++; do