tests: use `adjust` to handle libcxx requirement in Fedora and RHEL

This commit is contained in:
Milos Prchlik 2021-11-24 14:07:30 +01:00
parent 1bdf054407
commit 9e0411bb7b
2 changed files with 11 additions and 6 deletions

View File

@ -1,8 +1,6 @@
summary: Run the upstream LLVM integration test suite
description: |
Run the upstream LLVM integration test suite
NOTE: don't forget to disable libcxx tests when libcxx is not available, by adding -DENABLE_LIBCXX=OFF.
test: ./test.sh
require:
- cmake
@ -20,6 +18,13 @@ require:
- libstdc++-static
- clang-devel
- python3-lit
# Required in Fedora, but not shipped with RHEL. For future reference, comment the libcxx out as needed.
- libcxx-devel
adjust:
# libcxx shall be required in Fedora, it's not shipped with RHEL.
- require+:
- libcxx-devel
when: "distro == fedora"
because: testing against libcxx package in Fedora
- environment+:
CMAKE_CXXLIB: "-DENABLE_LIBCXX=OFF"
when: "distro == rhel"
because: libcxx is not shipped with RHEL

View File

@ -33,5 +33,5 @@ cd $(mktemp -d -p /var/tmp)
git clone $repo_url
cd llvm-toolchain-integration-test-suite
mkdir _build && cd _build
cmake .. -GNinja
cmake .. -GNinja "${CMAKE_CXXLIB:-}"
ninja $thread_args check