tests: fix llvm-toolchain and toolchains test requirements for centos and rhel

This commit is contained in:
Jesus Checa Hidalgo 2022-02-11 12:24:17 +01:00 committed by sergesanspaille
parent 70e5471c2f
commit 56439f6521
2 changed files with 10 additions and 6 deletions

View File

@ -32,5 +32,7 @@ adjust:
CXXLIB: "libstdc++" CXXLIB: "libstdc++"
require: require:
- libstdc++ - libstdc++
when: "distro == rhel" when: >-
distro == rhel
or distro == centos
because: testing against libstdc++ package in RHEL as libcxx is not shipped with RHEL because: testing against libstdc++ package in RHEL as libcxx is not shipped with RHEL

View File

@ -1,6 +1,8 @@
# TODO REVIEW: better summary # TODO REVIEW: better summary
summary: "" summary: ""
test: "$WITH_SCL ./test.sh" test: "$WITH_SCL ./test.sh"
require:
- glibc-static
adjust: adjust:
# Common requirements when LLVM is not SCL-ized # Common requirements when LLVM is not SCL-ized
- require+: - require+:
@ -14,19 +16,19 @@ adjust:
- environment+: - environment+:
CXXLIBS: "libc++" CXXLIBS: "libc++"
require: require+:
- libcxx-devel - libcxx-devel
when: "distro == fedora" when: "distro == fedora"
because: testing against libcxx package in Fedora because: testing against libcxx package in Fedora
- environment+: - environment+:
CXXLIBS: "libstdc++" CXXLIBS: "libstdc++"
require: require+:
- libstdc++ - libstdc++
when: "distro == rhel" when: >-
distro == rhel
or distro == centos
because: testing against libstdc++ package in RHEL as libcxx is not shipped with RHEL because: testing against libstdc++ package in RHEL as libcxx is not shipped with RHEL
# TODO REVIEW: are these all requirements? test.sh seems to run quite a lot of stuff, looks like we # TODO REVIEW: are these all requirements? test.sh seems to run quite a lot of stuff, looks like we
# need more packages from LLVM family. # need more packages from LLVM family.
require:
- glibc-static