test suite: break out build-modes-source

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/debian/tests/control b/debian/tests/control
index bb060936d1b47bee5fd70eab0d2e20ac0fd00e2f..d320fb60b15cbde581b4302263393cb39652daf3 100644 (file)
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -68,7 +68,7 @@ Tests: trustingpolicy-replay
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime, dput-ng
 
-Tests: absurd-gitapply badcommit-rewrite build-modes checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush sourceonlypolicy tag-updates unrepresentable version-opt
+Tests: absurd-gitapply badcommit-rewrite build-modes build-modes-source checkout clone-clogsigpipe clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject debpolicy-quilt-gbp defdistro-rpush defdistro-setup distropatches-reject dpkgsourceignores-correct drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast gbp-orig gitconfig gitworktree import-dsc import-maintmangle import-native import-nonnative import-tarbomb inarchivecopy mismatches-contents mismatches-dscchanges multisuite newtag-clone-nogit oldnewtagalt oldtag-clone-nogit orig-include-exclude orig-include-exclude-chkquery overwrite-chkclog overwrite-junk overwrite-splitbrains overwrite-version pbuilder protocol-compat push-buildproductsdir push-newpackage push-newrepeat push-nextdgit push-source push-source-with-changes quilt quilt-gbp quilt-gbp-build-modes quilt-singlepatch quilt-splitbrains quilt-useremail rpush sourceonlypolicy tag-updates unrepresentable version-opt
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, debhelper (>=8), fakeroot, build-essential, chiark-utils-bin, bc, faketime
 

diff --git a/tests/tests/build-modes b/tests/tests/build-modes
index c476ec815e46660044bcc4fccebacc9fefae7a0f..693fe52013a876c4bd3a41e59fe638234dc985df 100755 (executable)
--- a/tests/tests/build-modes
+++ b/tests/tests/build-modes
@@ -14,21 +14,10 @@ for act in                                  \
        'build -F'                              \
        'build -g'                              \
        'build -G'                              \
-       build-source                            \
 ; do
        bm-guess-e-source-e-targets "$act"
-
-       case $act in
-       build-source)
-               cleanmodes="$cleanmodes_all"
-               ;;
-       *)
-               cleanmodes="$cleanmodes_default"
-               ;;
-       esac
-
+       cleanmodes="$cleanmodes_default"
        real_act="$act"
-
        bm-act-iterate
 done
 

diff --git a/tests/tests/build-modes-source b/tests/tests/build-modes-source
new file mode 100755 (executable)
index 0000000..480e573
--- /dev/null
+++ b/tests/tests/build-modes-source
@@ -0,0 +1,17 @@
+#!/bin/bash
+set -e
+. tests/lib
+. $troot/lib-build-modes
+
+bm-prep
+
+for act in                                     \
+       build-source                            \
+; do
+       bm-guess-e-source-e-targets "$act"
+       cleanmodes="$cleanmodes_all"
+       real_act="$act"
+       bm-act-iterate
+done
+
+t-ok