Test suite: Break out bm-prep-ownpackage-branches

[dgit.git] / tests / lib-build-modes

diff --git a/tests/lib-build-modes b/tests/lib-build-modes
index 8fa263c34448176d43c53ab424529951253e9c13..c3d636781ae0b33e7135e9a52a7f328c3a1d2ec2 100644 (file)
--- a/tests/lib-build-modes
+++ b/tests/lib-build-modes
@@ -1,4 +1,17 @@
 
+bm-prep-ownpackage-branches () {
+       cat <<'END' >$tmp/stunt-git
+#!/bin/sh -e
+case "$*" in
+*clean*) echo >&2 "BUILD-MODES PROGRAM git $*" ;;
+esac
+exec git "$@"
+END
+       chmod +x $tmp/stunt-git
+
+       bm_branches="$1"
+}
+
 bm-prep () {
        t-tstunt-parsechangelog
 
@@ -11,14 +24,7 @@ bm-prep () {
                -i debian/control
        git commit -a -m bad-build-deps
 
-       cat <<'END' >$tmp/stunt-git
-#!/bin/sh -e
-case "$*" in
-*clean*) echo >&2 "BUILD-MODES PROGRAM git $*" ;;
-esac
-exec git "$@"
-END
-       chmod +x $tmp/stunt-git
+       bm-prep-ownpackage-branches 'indep-arch bad-build-deps'
 
        if zgrep 'dpkg-buildpackage: Make dependency checks fatal for -S' \
                /usr/share/doc/dpkg-dev/changelog.gz; then
@@ -57,8 +63,8 @@ bm-report-source () {
 
 bm-build-deps-ok () {
        case "$branch" in
-       indep-arch)             return 0        ;;
-       bad-build-deps)         return 1        ;;
+       *bad-build-deps*)       return 1        ;;
+       *)                      return 0        ;;
        esac
 }
 
@@ -152,7 +158,7 @@ bm-run-one () {
 
 bm-act-iterate () {
        for cleanmode in $cleanmodes; do
-               for branch in indep-arch bad-build-deps; do
+               for branch in $bm_branches; do
                        bm-run-one
                done
        done