Enable %check

Simplify %release

libglvnd.spec

@@ -1,17 +1,13 @@
 %global commit0 5baa1e5cfc422eb53e66f12ffb80c93d4a693cd9
-%global date 20180327
 %global shortcommit0 %%(c=%%{commit0}; echo ${c:0:7})
 
 %if 0%{?rhel} && 0%{?rhel} <= 7
 %global _without_mesa_glvnd_default 1
 %endif
 
-# Set to 0 to skip testsuite.
-%global with_tests 1
-
 Name:           libglvnd
 Version:        1.0.1
-Release:        0.5%{?commit0:.%{date}git%{shortcommit0}}%{?dist}
+Release:        0.6%{?commit0:.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
@@ -29,14 +25,7 @@ BuildRequires:  python3-libxml2
 BuildRequires:  pkgconfig(glproto)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
-
-# X11 tests:
-#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,13 +167,10 @@ 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
+xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
+    (cat `find . -name test-suite.log` ; exit 1)
 
 
 %ldconfig_scriptlets
@@ -243,6 +229,10 @@ xvfb-run -a  make check V=1 || cat `find . -name test-suite.log`
 
 
 %changelog
+* Thu Apr 26 2018 Adam Jackson <ajax@redhat.com> - 1.0.1-0.6.git5baa1e5
+- Enable %%check
+- Simplify %%release
+
 * Wed Apr 18 2018 Adam Jackson <ajax@redhat.com> - 1.0.1-0.5.20180327git5baa1e5
 - Go back to Requires: mesa-*, the fallout is too great (#1568881 etc)