From 0f74d9d90bbb3284dbbb3cca306607667aa9e94c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 3 Jul 2016 23:55:47 +0100 Subject: [PATCH 1/1] Test suite: Break out bm-prep-ownpackage-branches We are going to want to run some build modes tests on other exciting trees. --- tests/lib-build-modes | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/tests/lib-build-modes b/tests/lib-build-modes index 8fa263c3..c3d63678 100644 --- 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 -- 2.30.2