registry team mailing list archive

[Max Bowsher <maxb@xxxxxxx>]

Max Bowsher has proposed merging lp:~maxb/bzr/deb-test-better into lp:~debian-bazaar/bzr/unstable.

Requested reviews:
  Debian/Ubuntu Bazaar Maintainers (debian-bazaar)

For more details, see:
https://code.launchpad.net/~maxb/bzr/deb-test-better/+merge/50414
-- 
https://code.launchpad.net/~maxb/bzr/deb-test-better/+merge/50414
Your team Registry Administrators is subscribed to branch lp:~debian-bazaar/bzr/unstable.

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-18 20:50:14 +0000
+++ debian/changelog	2011-02-18 23:51:15 +0000
@@ -1,9 +1,15 @@
-bzr (2.3.0-2ubuntu1) UNRELEASED; urgency=low
+bzr (2.3.0-3) UNRELEASED; urgency=low
 
+  [ Jelmer Vernooij ]
   * Bump debhelper dependency to debhelper 7.4.16, required for our use
     of --list-missing and --fail-missing.
 
- -- Jelmer Vernooij <jelmer@xxxxxxxxxx>  Fri, 18 Feb 2011 21:50:12 +0100
+  [ Max Bowsher ]
+  * Run testsuite on bzr including compiled extensions.
+  * Run testsuite on all architectures, not just when doing an
+    architecture-independent build.
+
+ -- Max Bowsher <maxb@xxxxxxx>  Fri, 18 Feb 2011 23:43:25 +0000
 
 bzr (2.3.0-2) unstable; urgency=low
 

=== modified file 'debian/rules'
--- debian/rules	2011-02-07 14:53:09 +0000
+++ debian/rules	2011-02-18 23:51:15 +0000
@@ -11,20 +11,25 @@
 DEB_PYTHON_BUILD_ARGS += --executable "/usr/bin/python"
 DEB_COMPRESS_EXCLUDE += .svg .pdf
 
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-common-post-build-indep::
-	BZR_PLUGIN_PATH=-site:-user ./bzr selftest
-endif
-
 build/bzr:: debian/stamp-doc
 
 debian/stamp-doc:
 	$(MAKE) docs
 	touch $@
 
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+build/bzr:: debian/stamp-selftest
+
+debian/stamp-selftest:
+	BZR_PLUGIN_PATH=-site:-user \
+	PYTHONPATH=$(wildcard $(CURDIR)/build/lib.*-$(cdbs_python_current_version)) \
+	build/scripts-$(cdbs_python_current_version)/bzr selftest
+	touch $@
+endif
+
 clean::
 	$(MAKE) clean-docs
-	rm -f debian/stamp-doc
+	rm -f debian/stamp-*
 
 install/bzr-doc::
 # Install the documentation; since html and txt and intermixed