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

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Jun 28 14:46:28 2007
New Revision: 11719

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11719
Log:
* Make the testsuite failures fatal on arches which passed the testsuite
  with 2.13.5 in experimental (currently: alpha amd64 arm hppa i386 ia64
  mips powerpc s390); closes: #291486.
* Don't run the testsuite when cross-compiling.

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=11719&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Thu Jun 28 14:46:28 2007
@@ -4,8 +4,12 @@
     can result in duplicate deps; closes: #317461.
   * Set myself as maintainer.
   * Cleanups.
-
- -- Loic Minier <lool at dooz.org>  Thu, 28 Jun 2007 16:15:44 +0200
+  * Make the testsuite failures fatal on arches which passed the testsuite
+    with 2.13.5 in experimental (currently: alpha amd64 arm hppa i386 ia64
+    mips powerpc s390); closes: #291486.
+  * Don't run the testsuite when cross-compiling.
+
+ -- Loic Minier <lool at dooz.org>  Thu, 28 Jun 2007 16:45:56 +0200
 
 glib2.0 (2.13.5-1) experimental; urgency=low
 

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=11719&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules (original)
+++ desktop/experimental/glib2.0/debian/rules Thu Jun 28 14:46:28 2007
@@ -24,6 +24,10 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+# Debian architectures
+DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 
 # Ensure the build aborts when there are still references to undefined
@@ -52,6 +56,11 @@
 
 # list of flavors to run the test suite on
 CHECK_FLAVORS := $(filter deb, $(FLAVORS))
+
+# list of arches on which testsuite failures are fatal
+CHECK_SUPPORTED_ARCHES := alpha amd64 arm hppa i386 ia64 mips powerpc s390
+# testsuite is known to fail on kfreebsd -- i386 and amd64 -- and hurd
+# testsuite status is unknown on m68k, mipsel, and sparc
 
 # build dir for the current flavor; this is only expanded in flavor specific
 # targets
@@ -120,11 +129,19 @@
 
 build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
 
+maybe_ignore_check_failure = $(if $(filter ,$(CHECK_SUPPORTED_ARCHES)),-)
+
 $(STAMP_DIR)/check-stamp-%: $(STAMP_DIR)/build-stamp-%
 	dh_testdir
+ifeq ($(filter $(DEB_BUILD_ARCH),$(CHECK_SUPPORTED_ARCHES)),$(DEB_BUILD_ARCH))
+	# testsuite failures are fatal
+	LD_LIBRARY_PATH=$(builddir)/glib/.libs:$(builddir)/gmodule/.libs:$(builddir)/gobject/.libs:$(builddir)/gthread/.libs:$(LD_LIBRARY_PATH) \
+		$(MAKE) -C $(builddir) check
+else
 	# testsuite failures are ignored
 	-LD_LIBRARY_PATH=$(builddir)/glib/.libs:$(builddir)/gmodule/.libs:$(builddir)/gobject/.libs:$(builddir)/gthread/.libs:$(LD_LIBRARY_PATH) \
 		$(MAKE) -C $(builddir) check
+endif
 	touch $@
 
 check: $(addprefix $(STAMP_DIR)/check-stamp-, $(CHECK_FLAVORS))
@@ -167,7 +184,12 @@
 	-rm -rf $(STAMP_DIR)
 	dh_clean
 
+ifeq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
 maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
+else
+# can't run the testsuite when cross-compiling
+maybe_check =
+endif
 
 binary-indep: build $(maybe_check) install
 	dh_testdir