X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Ftests%2Fquilt-gbp-build-modes;h=28711ccb73acb1935cc552e8e25bde5548311d16;hp=4e256feb5cb4dcf240f9c3852f579f5311980192;hb=f81f0db4c42e6f9439146680b0bd057d0d64b672;hpb=c1701e7d575aec2dc420b0f54bf648e6d3fb1938

diff --git a/tests/tests/quilt-gbp-build-modes b/tests/tests/quilt-gbp-build-modes
index 4e256feb..28711ccb 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