From 7206be3e47809a7e0a5d79f7b9b32f1d0a82e1fa Mon Sep 17 00:00:00 2001 From: David Adam Date: Wed, 1 Apr 2020 17:16:52 +0800 Subject: [PATCH] fish.spec: stop running tests on RHEL 6 Due to RHEL's very old Python and other issues, keeping the tests running is more work than it's worth. Switch to making sure the compiled binary runs only. --- fish.spec.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/fish.spec.in b/fish.spec.in index cba6400fd..1a0e3e33b 100644 --- a/fish.spec.in +++ b/fish.spec.in @@ -22,7 +22,7 @@ BuildRequires: update-desktop-files %endif %if 0%{?opensuse_bs} && 0%{?rhel} && 0%{?rhel} < 7 -BuildRequires: gcc48 gcc48-c++ python-argparse +BuildRequires: gcc48 gcc48-c++ %endif # for tests @@ -95,7 +95,12 @@ cp -a CONTRIBUTING.md %{buildroot}%{_pkgdocdir} %if 0%{?__builddir:1} cd %__builddir %endif +# Turn off tests on RHEL 6, they are hard to keep running +%if 0%{?opensuse_bs} && 0%{?rhel} && 0%{?rhel} < 7 +./fish -c 'exit 0' +%else make test SHOW_INTERACTIVE_LOG=1 +%endif %clean rm -rf $RPM_BUILD_ROOT