r54758 - in /desktop/unstable/gnome-shell/debian: changelog rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Nov  5 19:02:55 2017
New Revision: 54758

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54758
Log:
Honour DEB_BUILD_OPTIONS=nocheck so we don't try to run the test suite if
xvfb is not installed

Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/rules

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=54758&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog	[utf-8] Sun Nov  5 19:02:55 2017
@@ -5,6 +5,8 @@
   * Switch to dh_missing
   * Update list of binaries in gnome-shell.lintian-overrides using an RPATH
     for mutter. Don't hard-code the path to be x86_64-linux-gnu specific.
+  * Honour DEB_BUILD_OPTIONS=nocheck so we don't try to run the test suite if
+    xvfb is not installed
 
  -- Michael Biebl <biebl at debian.org>  Sun, 05 Nov 2017 19:15:39 +0100
 

Modified: desktop/unstable/gnome-shell/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/rules?rev=54758&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/rules	[utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/rules	[utf-8] Sun Nov  5 19:02:55 2017
@@ -43,8 +43,10 @@
 	dh_translations
 
 override_dh_auto_test:
+ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS)))
 ifeq (yes,$(shell dpkg-vendor --derives-from Ubuntu && echo yes))
 	xvfb-run dh_auto_test
 else	
 	-xvfb-run dh_auto_test
 endif
+endif