bzr-builddeb

Merge lp:~jelmer/bzr-builddeb/testsuite into lp:bzr-builddeb

  1. testsuite
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Merged at revision: 511
Proposed branch: lp:~jelmer/bzr-builddeb/testsuite
Merge into: lp:bzr-builddeb
Diff against target: 48 lines (+7/-5)
3 files modified
debian/changelog (+4/-2)
debian/control (+1/-1)
debian/rules (+2/-2)
To merge this branch: bzr merge lp:~jelmer/bzr-builddeb/testsuite
Reviewer Review Type Date Requested Status
James Westby Approve
Review via email: mp+48470@code.launchpad.net

Description of the change

Always run the testsuite during package build unless DEB_BUILD_OPTIONS=nocheck, consistent with policy.

Fix build dependencies for the testsuite and use selftest rather than test-builddeb, which no longer exists.

To post a comment you must log in.
Revision history for this message
James Westby (james-w) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-02-03 10:37:01 +0000
3+++ debian/changelog 2011-02-03 13:41:52 +0000
4@@ -1,4 +1,4 @@
5-bzr-builddeb (2.5.1) UNRELEASED; urgency=low
6+bzr-builddeb (2.5.1) unstable; urgency=low
7
8 [ James Westby ]
9
10@@ -45,8 +45,10 @@
11 kind of compression is supported on tarballs. LP: #627718
12 * Support upstream version strings containing dashes. Patch by Stefano
13 Rivera. LP: #711826
14+ * Run test suite unless nocheck is set (consistent with policy).
15+ * Fix build dependencies for test suite.
16
17- -- Jelmer Vernooij <jelmer@debian.org> Thu, 03 Feb 2011 11:36:59 +0100
18+ -- Jelmer Vernooij <jelmer@debian.org> Thu, 03 Feb 2011 14:38:04 +0100
19
20 bzr-builddeb (2.5) unstable; urgency=low
21
22
23=== modified file 'debian/control'
24--- debian/control 2010-08-11 16:24:03 +0000
25+++ debian/control 2011-02-03 13:41:52 +0000
26@@ -4,7 +4,7 @@
27 Maintainer: Debian Bazaar Maintainers <pkg-bazaar-maint@lists.alioth.debian.org>
28 Uploaders: Reinhard Tartler <siretart@tauware.de>, James Westby <james.westby@ubuntu.com>, Jelmer Vernooij <jelmer@debian.org>
29 Build-Depends: debhelper (>= 5.0.37.2), python-all (>= 2.3.5-11)
30-Build-Depends-Indep: bzr (>= 2.1~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils
31+Build-Depends-Indep: bzr (>= 2.1~), python-central (>= 0.5.8), python-docutils, python-debian (>= 0.1.11), python-apt, patchutils, python-testtools (>= 0.9.2), pristine-tar
32 Vcs-Bzr: http://bzr.debian.org/pkg-bazaar/bzr-builddeb/unstable
33 Vcs-Browser: http://bzr.debian.org/loggerhead/pkg-bazaar/bzr-builddeb/unstable
34 XS-Python-Version: >= 2.4
35
36=== modified file 'debian/rules'
37--- debian/rules 2010-01-18 06:32:06 +0000
38+++ debian/rules 2011-02-03 13:41:52 +0000
39@@ -21,8 +21,8 @@
40
41 build-python%:
42 python$* setup.py build
43-ifneq (,$(filter test check,$(DEB_BUILD_OPTIONS)))
44- BZR_PLUGIN_PATH="$(CURDIR)/build/lib/bzrlib/plugins/" python$* /usr/bin/bzr test-builddeb
45+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
46+ BZR_PLUGINS_AT=builddeb@$(CURDIR) python$* /usr/bin/bzr selftest -s bp.builddeb
47 endif
48 touch $@-stamp
49

Subscribers

People subscribed via source and target branches