summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-19 02:01:09 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-25 20:12:52 +0100
commit9d9e0d09473ec4f789dba1167bd936b2d630aecf (patch)
treea457df093cf3beb4a240318a34435ed6483f5f9b
parente0f2481785baebd56a8082c9353071ae83c11922 (diff)
Test suite: quilt-gbp-build-modes-sbuild: Split out
Now the other tests can run even if the sbuild chroot is not available. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--TODO.BRANCH2
-rw-r--r--debian/tests/control4
-rwxr-xr-xtests/tests/quilt-gbp-build-modes4
-rwxr-xr-xtests/tests/quilt-gbp-build-modes-sbuild12
4 files changed, 14 insertions, 8 deletions
diff --git a/TODO.BRANCH b/TODO.BRANCH
index 9d2866e..1227483 100644
--- a/TODO.BRANCH
+++ b/TODO.BRANCH
@@ -22,8 +22,6 @@ Want tests for
* Want drs-quilt-gbp test.
- * Split quilt-gbp-build-modes into one with sbuild and one without
-
* Add t-tstunt-parsechangelog to various tests
diff --git a/debian/tests/control b/debian/tests/control
index 34ef4e5..a312861 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -11,12 +11,12 @@ Tests: mirror mirror-debnewgit mirror-private
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, rsync
-Tests: build-modes-sbuild quilt-gbp-build-modes
+Tests: build-modes-sbuild quilt-gbp-build-modes-sbuild
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts, sbuild
Restrictions: x-dgit-schroot-build
-Tests: build-modes build-modes-asplit build-modes-gbp-asplit clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast inarchivecopy newtag-clone-nogit oldtag-clone-nogit push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-singlepatch rpush tag-updates test-list-uptodate trustingpolicy-replay
+Tests: build-modes build-modes-asplit build-modes-gbp-asplit clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast inarchivecopy newtag-clone-nogit oldtag-clone-nogit push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch rpush tag-updates test-list-uptodate trustingpolicy-replay
Tests-Directory: tests/tests
Depends: dgit, dgit-infrastructure, devscripts
diff --git a/tests/tests/quilt-gbp-build-modes b/tests/tests/quilt-gbp-build-modes
index 8f488bb..b89c26e 100755
--- a/tests/tests/quilt-gbp-build-modes
+++ b/tests/tests/quilt-gbp-build-modes
@@ -3,15 +3,11 @@ set -e
. tests/lib
. $troot/lib-build-modes
-t-dependencies sbuild
-t-restrict x-dgit-schroot-build
-
bm-gbp-example-acts \
'build-source' \
'build -b' \
'build -S' \
'gbp-build -S' \
'gbp-build -b' \
- 'sbuild -c build --arch-all' \
echo ok.
diff --git a/tests/tests/quilt-gbp-build-modes-sbuild b/tests/tests/quilt-gbp-build-modes-sbuild
new file mode 100755
index 0000000..8da93d3
--- /dev/null
+++ b/tests/tests/quilt-gbp-build-modes-sbuild
@@ -0,0 +1,12 @@
+#!/bin/bash
+set -e
+. tests/lib
+. $troot/lib-build-modes
+
+t-dependencies sbuild
+t-restrict x-dgit-schroot-build
+
+bm-gbp-example-acts \
+ 'sbuild -c build --arch-all' \
+
+echo ok.