r35732 - in /desktop/experimental/glib2.0/debian: changelog rules

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Sep 20 15:58:31 2012
New Revision: 35732

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=35732
Log:
debian/rules: Only run tests for the main flavour; it takes too
long for all three and does not give us a lot of extra confidence.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=35732&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Sep 20 15:58:31 2012
@@ -1,3 +1,10 @@
+glib2.0 (2.33.14-2) UNRELEASED; urgency=low
+
+  * debian/rules: Only run tests for the main flavour; it takes too
+    long for all three and does not give us a lot of extra confidence.
+
+ -- Martin Pitt <mpitt at debian.org>  Thu, 20 Sep 2012 17:57:19 +0200
+
 glib2.0 (2.33.14-1) experimental; urgency=low
 
   [ Iain Lane ]

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=35732&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Thu Sep 20 15:58:31 2012
@@ -55,11 +55,11 @@
 export G_HOME=$(CURDIR)/debian/build
 
 # make tests non-fatal on Debian architectures which currently have failed
-# tests; always fail on Ubuntu
+# tests; always fail on Ubuntu; only run the tests for the main flavour
 ifneq ($(findstring $(DEB_BUILD_ARCH), armel armhf kfreebsd-i386 kfreebsd-amd64 s390x sparc mips hurd-i386),)
-DEB_MAKE_CHECK_TARGET = -k check || ! dpkg-vendor --is ubuntu
+DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check || ! dpkg-vendor --is ubuntu)
 else
-DEB_MAKE_CHECK_TARGET = -k check
+DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check)
 endif
 
 # configure flags