BR Mojo::File and run fullstack test only on F >24

f38
Adam Williamson 8 years ago
parent 7e59ddb370
commit 4ec318c2b5

@ -8,6 +8,15 @@
%global with_tests 1 %global with_tests 1
%endif %endif
# Full stack test only runs reliably on x86, and requires a Mojo
# component which isn't available on Fedora < 25
%ifnarch %{ix86} x86_64
%global no_fullstack 1
%endif
%if 0%{?fedora} < 25
%global no_fullstack 1
%endif
# os-autoinst has a bunch of annoyingly-badly-named private modules, # os-autoinst has a bunch of annoyingly-badly-named private modules,
# we do not want automatic provides or requires for these # we do not want automatic provides or requires for these
# ref https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Perl # ref https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering#Perl
@ -59,7 +68,6 @@ BuildRequires: pkgconfig(theoraenc)
BuildRequires: systemd BuildRequires: systemd
%if 0%{?with_tests} %if 0%{?with_tests}
BuildRequires: perl(Devel::Cover) BuildRequires: perl(Devel::Cover)
BuildRequires: perl(Mojo::File)
BuildRequires: perl(Pod::Coverage) BuildRequires: perl(Pod::Coverage)
# The OO interface to Test::Compile only appeared in 1.1.0 # The OO interface to Test::Compile only appeared in 1.1.0
BuildRequires: perl(Test::Compile) >= 1.1.0 BuildRequires: perl(Test::Compile) >= 1.1.0
@ -73,6 +81,10 @@ BuildRequires: perl(Try::Tiny)
# 'fullstack' test uses these # 'fullstack' test uses these
BuildRequires: /usr/bin/qemu-system-i386 BuildRequires: /usr/bin/qemu-system-i386
BuildRequires: /usr/bin/qemu-img BuildRequires: /usr/bin/qemu-img
%if 0%{?no_fullstack}
%else
BuildRequires: perl(Mojo::File)
%endif # no_fullstack
%endif # with_tests %endif # with_tests
Requires: /usr/bin/qemu-img Requires: /usr/bin/qemu-img
Requires: optipng Requires: optipng
@ -121,8 +133,7 @@ This package contains Open vSwitch support for os-autoinst.
%prep %prep
%autosetup -n %{github_name}-%{github_commit} -p1 %autosetup -n %{github_name}-%{github_commit} -p1
# the full-stack test only really runs reliably on x86_64 and i386 %if 0%{?no_fullstack}
%ifnarch %{ix86} x86_64
rm -f t/99-full-stack.t rm -f t/99-full-stack.t
sed -i -e 's, 99-full-stack.t,,g' t/Makefile.am sed -i -e 's, 99-full-stack.t,,g' t/Makefile.am
%endif %endif

Loading…
Cancel
Save