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>

diff --git a/TODO.BRANCH b/TODO.BRANCH
index 9d2866e58602b4f82dd12f71bfd3b44355186766..1227483a8d3b3a73edb6193b16784c45a10c6cde 100644 (file)
--- 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 34ef4e571cb5121e6fd72a291e6caddd8bdb39d8..a312861726bb51ff6980b116dba883baa09d4f70 100644 (file)
--- 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 8f488bb08eafd021277b72f8d3c058980281247d..b89c26e2e9fb6f3e23d4037bcabcebf61fd2395b 100755 (executable)
--- 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 (executable)
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.