#125 tests: use `adjust` to handle libcxx requirement in Fedora and RHEL
Merged 10 months ago by sergesanspaille. Opened 10 months ago by happz.

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

    - 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

@@ -33,5 +33,5 @@ 

  git clone $repo_url

  cd llvm-toolchain-integration-test-suite

  mkdir _build && cd _build

- cmake .. -GNinja

+ cmake .. -GNinja "${CMAKE_CXXLIB:-}"

  ninja $thread_args check

no initial comment

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Pull-Request has been merged by sergesanspaille

10 months ago

s390x bots are in a bad state anyway, and that's not llvm's fault