r9494 - in /desktop/experimental/gtk+2.0/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Apr  2 16:10:26 2007
New Revision: 9494

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

Modified:
    desktop/experimental/gtk+2.0/debian/changelog
    desktop/experimental/gtk+2.0/debian/rules

Modified: desktop/experimental/gtk+2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/changelog?rev=9494&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/changelog (original)
+++ desktop/experimental/gtk+2.0/debian/changelog Mon Apr  2 16:10:26 2007
@@ -4,8 +4,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, 26 Mar 2007 16:44:32 +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 18:10:18 +0200
 
 gtk+2.0 (2.10.11-1) experimental; urgency=low
 

Modified: desktop/experimental/gtk+2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B2.0/debian/rules?rev=9494&op=diff
==============================================================================
--- desktop/experimental/gtk+2.0/debian/rules (original)
+++ desktop/experimental/gtk+2.0/debian/rules Mon Apr  2 16:10:26 2007
@@ -62,6 +62,9 @@
 # args are defined below), a build pass, and an install pass (in two steps)
 # Note: the shared flavor is required
 FLAVORS := directfb shared static
+
+# list of flavors to run the test suite on
+CHECK_FLAVORS := $(filter directfb shared static, $(FLAVORS))
 
 # build dir for the current flavor; this is only expanded in flavor specific
 # targets
@@ -156,6 +159,17 @@
 
 build: $(addprefix $(STAMP_DIR)/build-stamp-, $(FLAVORS))
 
+$(STAMP_DIR)/check-stamp-%: $(STAMP_DIR)/build-stamp-%
+	dh_testdir
+	# setting LD_LIBRARY_PATH for "make check" might be needed in the
+	# future, but doesn't seem necessary right now
+	#LD_LIBRARY_PATH=$(builddir)/gdk-pixbuf/.libs:$(builddir)/gtk/.libs:$(builddir)/gdk/.libs:$(LD_LIBRARY_PATH)
+	# testsuite failures are ignored
+	-$(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 \
@@ -208,7 +222,9 @@
 	-rm -f debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.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_install -i
@@ -223,7 +239,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1
+binary-arch: build $(maybe_check) install $(call dh_subst_files,$(BINARY_ARCH_PKGS)) debian/update-gdkpixbuf-loaders debian/update-gtk-immodules debian/dh_gtkmodules debian/dh_gtkmodules.1
 	dh_testdir
 	dh_testroot
 	dh_install -a
@@ -282,4 +298,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