From e389ff61d3f4c13276fe12755c89f6b7b5a2dc45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 4 Apr 2017 16:11:29 +0200 Subject: [PATCH] Add conditional to disable testsuite, when needed --- libglvnd.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/libglvnd.spec b/libglvnd.spec index c4f1c7d..f971035 100644 --- a/libglvnd.spec +++ b/libglvnd.spec @@ -6,9 +6,12 @@ %global _without_mesa_glvnd_default 1 %endif +# Set to 0 to skip testsuite. +%global with_tests 1 + Name: libglvnd 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 Epoch: 1 Summary: The GL Vendor-Neutral Dispatch library @@ -31,7 +34,9 @@ BuildRequires: pkgconfig(xext) #Xvfb is unlikely to reproduce a full Xorg environnement #So some tests are failing #https://github.com/NVIDIA/libglvnd/issues/93 +%if 0%{?with_tests} BuildRequires: xorg-x11-server-Xvfb +%endif %if (0%{?rhel} && 0%{?rhel} <= 6) BuildRequires: autoconf268 @@ -178,11 +183,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/egl/egl_external_platform.d mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d +%if 0%{?with_tests} %check export DO_X11_TESTS=1 # these tests are skipped in mock (server does not support the GLX extension) # SKIP: testglxqueryversion.sh xvfb-run -a make check V=1 || cat `find . -name test-suite.log` +%endif %post -p /sbin/ldconfig @@ -244,6 +251,9 @@ xvfb-run -a make check V=1 || cat `find . -name test-suite.log` %changelog +* Tue Apr 04 2017 Björn Esser - 1:0.2.999-17.20170308git8e6e102 +- Add conditional to disable testsuite, when needed + * Tue Apr 04 2017 Björn Esser - 1:0.2.999-16.20170308git8e6e102 - Rebuilt with testsuite again