From 18f0d9a0727c4123401c7c6b2a9f5d951a9cf436 Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Wed, 4 May 2022 15:50:08 +0200
Subject: [PATCH] tests: do not use ninja-build for integration testsuite

ninja-build is distributed from extra repos such as epel.
Unfortunately this is not available in all supported archs
which makes it impossible to test with ninja-build.
---
 tests/build-gating.fmf                | 12 +-----------
 tests/integration-test-suite/main.fmf |  1 -
 tests/integration-test-suite/test.sh  |  6 ++++--
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/tests/build-gating.fmf b/tests/build-gating.fmf
index 3d80af0..d7549b2 100644
--- a/tests/build-gating.fmf
+++ b/tests/build-gating.fmf
@@ -37,7 +37,7 @@ adjust:
     when: >-
       distro == centos
 
-  # Unfortunatelly, 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.
   - because: "On RHEL, CRB must be enabled to provide rarer packages"
     prepare+:
       - name: Enable CRB
@@ -47,16 +47,6 @@ adjust:
       distro == rhel-9
       or distro == rhel-8
 
-  # Unfortunatelly, TMT does not support more declarative approach, we need to run commands on our own.
-  - because: "On RHEL-7, EPEL must be enabled to provided rarer packages"
-    prepare+:
-      - name: Enable EPEL
-        how: shell
-        script: |
-          rpm -q epel-release || yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
-          yum-config-manager --enable epel
-    when: distro == rhel-7
-
 discover:
     how: fmf
 execute:
diff --git a/tests/integration-test-suite/main.fmf b/tests/integration-test-suite/main.fmf
index 41e9fbd..60504b4 100644
--- a/tests/integration-test-suite/main.fmf
+++ b/tests/integration-test-suite/main.fmf
@@ -6,7 +6,6 @@ require:
   - git
   - make
   # These require special repositories to be enabled on RHEL
-  - ninja-build
   - libstdc++-static
 adjust:
   # Common requirements when LLVM is not SCL-ized
diff --git a/tests/integration-test-suite/test.sh b/tests/integration-test-suite/test.sh
index a49bdd4..e350c57 100755
--- a/tests/integration-test-suite/test.sh
+++ b/tests/integration-test-suite/test.sh
@@ -33,5 +33,7 @@ cd $(mktemp -d -p /var/tmp)
 git clone $repo_url
 cd llvm-toolchain-integration-test-suite
 mkdir _build && cd _build
-cmake .. -GNinja ${CMAKE_CXXLIB:-}
-cmake --build . $thread_args --target check
+cmake .. ${CMAKE_CXXLIB:-}
+# Do not run with make as it will return 2 in case of failures, which will be
+# reported by tmt as error instead failure. Run with lit so it returns 1.
+lit --show-unsupported --show-xfail -v tests