summaryrefslogtreecommitdiff
path: root/tests/tests/quilt-gbp-build-modes
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-05 22:42:21 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2016-09-15 19:42:05 +0100
commitf81f0db4c42e6f9439146680b0bd057d0d64b672 (patch)
tree0c730afc3a058c19598b7c77a2e31dc82e83679e /tests/tests/quilt-gbp-build-modes
parentc1701e7d575aec2dc420b0f54bf648e6d3fb1938 (diff)
Test suite: quilt-gb-build-modes: Fixes, passes now
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests/tests/quilt-gbp-build-modes')
-rwxr-xr-xtests/tests/quilt-gbp-build-modes6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/tests/quilt-gbp-build-modes b/tests/tests/quilt-gbp-build-modes
index 4e256fe..28711cc 100755
--- a/tests/tests/quilt-gbp-build-modes
+++ b/tests/tests/quilt-gbp-build-modes
@@ -4,12 +4,11 @@ set -e
. $troot/lib-build-modes
t-dependencies sbuild
-t-restrict x-dgit-unfinished
t-restrict x-dgit-schroot-build
t-gbp-example-prep
-git checkout -b for-build-modes patch-queue/quilt-tip-2
+git checkout -b for-build-modes qc/quilt-tip-2
# build-modes cannot cope with branches containing /
bm-prep-ownpackage-branches for-build-modes
@@ -22,12 +21,13 @@ for act in \
'build -S' \
'gbp-build -S' \
'gbp-build -b' \
- 'sbuild -c build --no-arch-all' \
+ 'sbuild -c build --arch-all' \
; do
bm-guess-e-source-e-targets "$act"
real_act="--quilt=gbp $act"
case "$act" in
sbuild*) bm_quirk_after_act=bm-quirk-sbuild-after-act ;;
+ gbp-*) real_act="$real_act --git-ignore-branch" ;;
*) bm_quirk_after_act='' ;;
esac
bm-act-iterate