Add conditional to disable testsuite, when needed
This commit is contained in:
parent
d0e5f0eba6
commit
e389ff61d3
@ -6,9 +6,12 @@
|
|||||||
%global _without_mesa_glvnd_default 1
|
%global _without_mesa_glvnd_default 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
# Set to 0 to skip testsuite.
|
||||||
|
%global with_tests 1
|
||||||
|
|
||||||
Name: libglvnd
|
Name: libglvnd
|
||||||
Version: 0.2.999
|
Version: 0.2.999
|
||||||
Release: 16%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
|
Release: 17%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
|
||||||
# Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
|
# Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Summary: The GL Vendor-Neutral Dispatch library
|
Summary: The GL Vendor-Neutral Dispatch library
|
||||||
@ -31,7 +34,9 @@ BuildRequires: pkgconfig(xext)
|
|||||||
#Xvfb is unlikely to reproduce a full Xorg environnement
|
#Xvfb is unlikely to reproduce a full Xorg environnement
|
||||||
#So some tests are failing
|
#So some tests are failing
|
||||||
#https://github.com/NVIDIA/libglvnd/issues/93
|
#https://github.com/NVIDIA/libglvnd/issues/93
|
||||||
|
%if 0%{?with_tests}
|
||||||
BuildRequires: xorg-x11-server-Xvfb
|
BuildRequires: xorg-x11-server-Xvfb
|
||||||
|
%endif
|
||||||
|
|
||||||
%if (0%{?rhel} && 0%{?rhel} <= 6)
|
%if (0%{?rhel} && 0%{?rhel} <= 6)
|
||||||
BuildRequires: autoconf268
|
BuildRequires: autoconf268
|
||||||
@ -178,11 +183,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/egl/egl_external_platform.d
|
|||||||
mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d
|
mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d
|
||||||
|
|
||||||
|
|
||||||
|
%if 0%{?with_tests}
|
||||||
%check
|
%check
|
||||||
export DO_X11_TESTS=1
|
export DO_X11_TESTS=1
|
||||||
# these tests are skipped in mock (server does not support the GLX extension)
|
# these tests are skipped in mock (server does not support the GLX extension)
|
||||||
# SKIP: testglxqueryversion.sh
|
# SKIP: testglxqueryversion.sh
|
||||||
xvfb-run -a make check V=1 || cat `find . -name test-suite.log`
|
xvfb-run -a make check V=1 || cat `find . -name test-suite.log`
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%post -p /sbin/ldconfig
|
%post -p /sbin/ldconfig
|
||||||
@ -244,6 +251,9 @@ xvfb-run -a make check V=1 || cat `find . -name test-suite.log`
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 04 2017 Björn Esser <besser82@fedoraproject.org> - 1:0.2.999-17.20170308git8e6e102
|
||||||
|
- Add conditional to disable testsuite, when needed
|
||||||
|
|
||||||
* Tue Apr 04 2017 Björn Esser <besser82@fedoraproject.org> - 1:0.2.999-16.20170308git8e6e102
|
* Tue Apr 04 2017 Björn Esser <besser82@fedoraproject.org> - 1:0.2.999-16.20170308git8e6e102
|
||||||
- Rebuilt with testsuite again
|
- Rebuilt with testsuite again
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user