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

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Apr  2 13:18:28 2007
New Revision: 9486

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9486
Log:
* Run "make check" test suite for the deb flavor except if DEB_BUILD_OPTIONS
  contains the "nocheck" keyword; ignore failures.

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=9486&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog (original)
+++ desktop/experimental/glib2.0/debian/changelog Mon Apr  2 13:18:28 2007
@@ -1,3 +1,10 @@
+glib2.0 (2.12.11-2) UNRELEASED; urgency=low
+
+  * Run "make check" test suite for the deb flavor except if DEB_BUILD_OPTIONS
+    contains the "nocheck" keyword; ignore failures.
+
+ -- Loic Minier <lool at dooz.org>  Mon, 02 Apr 2007 15:16:13 +0200
+
 glib2.0 (2.12.11-1) experimental; urgency=medium
 
   * New upstream release; no API change.

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=9486&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules (original)
+++ desktop/experimental/glib2.0/debian/rules Mon Apr  2 13:18:28 2007
@@ -52,6 +52,9 @@
 # args are defined below), a build pass, and an install pass (in two steps)
 # Note: the shared flavor is required
 FLAVORS := deb udeb
+
+# list of flavors to run the test suite on
+CHECK_FLAVORS := $(filter deb, $(FLAVORS))
 
 # build dir for the current flavor; this is only expanded in flavor specific
 # targets
@@ -118,6 +121,15 @@
 
 build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
 
+$(STAMP_DIR)/check-stamp-%: $(STAMP_DIR)/build-stamp-%
+	dh_testdir
+	# 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
+	touch $@
+
+check: $(addprefix $(STAMP_DIR)/check-stamp-, $(CHECK_FLAVORS))
+
 $(STAMP_DIR)/install-stamp-%: $(STAMP_DIR)/build-stamp-%
 	mkdir -p $(installdir)
 	$(MAKE) -C $(builddir) install \
@@ -156,7 +168,9 @@
 	-rm -rf $(STAMP_DIR)
 	dh_clean
 
-binary-indep: build install
+maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
+
+binary-indep: build $(maybe_check) install
 	dh_testdir
 	dh_testroot
 	dh_install -i
@@ -170,7 +184,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build install
+binary-arch: build $(maybe_check) install
 	dh_testdir
 	dh_testroot
 	dh_install -a