r9492 - in /desktop/experimental/pango1.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Apr  2 14:29:25 2007
New Revision: 9492

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

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

Modified: desktop/experimental/pango1.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/changelog?rev=9492&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/changelog (original)
+++ desktop/experimental/pango1.0/debian/changelog Mon Apr  2 14:29:25 2007
@@ -3,8 +3,10 @@
   * Fix control generation.
   * Include the new uploaders.mk from gnome-pkg-tools instead of duplicating
     its logic; build-dep on gnome-pkg-tools >= 0.11.
-
- -- Loic Minier <lool at dooz.org>  Mon, 02 Apr 2007 15:36:10 +0200
+  * 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:39:18 +0200
 
 pango1.0 (1.16.1-1) experimental; urgency=low
 

Modified: desktop/experimental/pango1.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/pango1.0/debian/rules?rev=9492&op=diff
==============================================================================
--- desktop/experimental/pango1.0/debian/rules (original)
+++ desktop/experimental/pango1.0/debian/rules Mon Apr  2 14:29:25 2007
@@ -72,6 +72,9 @@
 # args are defined below), a build pass, and an install pass (in two steps)
 # Note: the shared flavor is required
 FLAVORS := shared static udeb
+
+# list of flavors to run the test suite on
+CHECK_FLAVORS := $(filter shared, $(FLAVORS))
 
 # build dir for the current flavor; this is only expanded in flavor specific
 # targets
@@ -152,6 +155,15 @@
 	touch $@
 
 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)/pango/.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)
@@ -197,7 +209,9 @@
 	-rm -f debian/dh_pangomodules debian/dh_pangomodules.1
 	dh_clean
 
-binary-indep: build install $(call dh_subst_files,$(BINARY_INDEP_PKGS))
+maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
+
+binary-indep: build $(maybe_check) install $(call dh_subst_files,$(BINARY_INDEP_PKGS))
 	dh_testdir
 	dh_testroot
 	dh_installdirs -i
@@ -213,7 +227,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/dh_pangomodules debian/dh_pangomodules.1
+binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/dh_pangomodules debian/dh_pangomodules.1
 	dh_testdir
 	dh_testroot
 	dh_install -a
@@ -258,4 +272,4 @@
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: patch configure build install clean binary-indep binary-arch binary
+.PHONY: patch configure build check install clean binary-indep binary-arch binary