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

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Fri Nov  2 20:22:32 2012
New Revision: 36219

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36219
Log:
debian/rules: Re-enable failing the build on failed tests on armel/armhf
on Ubuntu, now that the buildds behave themselves again.

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=36219&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Fri Nov  2 20:22:32 2012
@@ -1,6 +1,11 @@
 glib2.0 (2.34.1-3) UNRELEASED; urgency=low
 
+  [ Simon McVittie ]
   * Mark 91_kfreebsd_credentials.patch as having gone upstream
+
+  [ Martin Pitt ]
+  * debian/rules: Re-enable failing the build on failed tests on armel/armhf
+    on Ubuntu, now that the buildds behave themselves again.
 
  -- Simon McVittie <smcv at debian.org>  Fri, 02 Nov 2012 14:12:24 +0000
 

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=36219&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Fri Nov  2 20:22:32 2012
@@ -55,10 +55,9 @@
 export G_HOME=$(CURDIR)/debian/build
 
 # make tests non-fatal on Debian architectures which currently have failed
-# tests; armel/armhf builders on Ubuntu are currently too swap-happy and
-# unpredictable
+# 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 = $(if $(filter deb, $(cdbs_make_curflavor)), -k check || true)
+DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check || ! dpkg-vendor --is ubuntu)
 else
 DEB_MAKE_CHECK_TARGET = $(if $(filter deb, $(cdbs_make_curflavor)), -k check)
 endif