r22404 - in /desktop/unstable/pygtk/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Nov 20 18:49:54 2009
New Revision: 22404

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=22404
Log:
* Split make check in their own targets.
* Also make check for -dbg builds.
* Don't make check when nocheck is in DEB_BUILD_OPTIONS; thanks
  Daniel Schepler.
* Set PYTHON= properly during make check.

Modified:
    desktop/unstable/pygtk/debian/changelog
    desktop/unstable/pygtk/debian/rules

Modified: desktop/unstable/pygtk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/changelog?rev=22404&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/changelog [utf-8] (original)
+++ desktop/unstable/pygtk/debian/changelog [utf-8] Fri Nov 20 18:49:54 2009
@@ -7,6 +7,11 @@
   [ Loïc Minier ]
   * Bump pango-dev bdep to 1.21.4 for pango_font_map_create_context(); thanks
     Jonas Smedegaard; closes: #554915.
+  * Split make check in their own targets.
+  * Also make check for -dbg builds.
+  * Don't make check when nocheck is in DEB_BUILD_OPTIONS; thanks
+    Daniel Schepler.
+  * Set PYTHON= properly during make check.
 
  -- Josselin Mouette <joss at debian.org>  Mon, 19 Oct 2009 09:43:58 +0200
 

Modified: desktop/unstable/pygtk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygtk/debian/rules?rev=22404&op=diff
==============================================================================
--- desktop/unstable/pygtk/debian/rules [utf-8] (original)
+++ desktop/unstable/pygtk/debian/rules [utf-8] Fri Nov 20 18:49:54 2009
@@ -61,7 +61,6 @@
 build-%/build-stamp: build-%/configure-stamp
 	dh_testdir
 	PYTHON=/usr/bin/python$* $(MAKE) -C build-$* pyexecdir=/var/lib/python-support/python$*
-	xvfb-run -s -noreset $(MAKE) -C build-$* check
 	touch $@
 
 dbg-build-%/configure-stamp: patch-stamp
@@ -78,6 +77,18 @@
 	touch $@
 
 build: $(PYVERS:%=build-%/build-stamp) $(PYVERS:%=dbg-build-%/build-stamp)
+
+build-%/check-stamp: build-%/build-stamp
+	dh_testdir
+	PYTHON=/usr/bin/python$* xvfb-run -s -noreset $(MAKE) -C build-$* check
+	touch $@
+
+dbg-build-%/check-stamp: dbg-build-%/build-stamp
+	dh_testdir
+	PYTHON=/usr/bin/python$*-dbg xvfb-run -s -noreset $(MAKE) -C dbg-build-$* check
+	touch $@
+
+check: $(PYVERS:%=build-%/check-stamp) $(PYVERS:%=dbg-build-%/check-stamp)
 
 build-%/install-stamp: build-%/build-stamp
 	dh_testdir
@@ -149,7 +160,9 @@
 	$(MAKE) -f debian/rules unpatch
 	dh_clean
 
-binary-indep: build install
+maybe_check = $(if $(findstring nocheck,$(DEB_BUILD_OPTIONS)),,check)
+
+binary-indep: build install $(maybe_check)
 	dh_testdir
 	dh_testroot
 	dh_installdocs -i
@@ -167,7 +180,7 @@
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build install
+binary-arch: build install $(maybe_check)
 	dh_testdir
 	dh_testroot
 	dh_installdocs -s
@@ -187,4 +200,4 @@
 	dh_builddeb -s
 
 binary: binary-arch binary-indep
-.PHONY: patch unpatch build install clean binary-indep binary-arch binary
+.PHONY: patch unpatch build check install clean binary-indep binary-arch binary