From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Mon, 5 Sep 2016 21:42:21 +0000 (+0100)
Subject: Test suite: quilt-gb-build-modes: Fixes, passes now
X-Git-Tag: archive/debian/2.0~174
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=f81f0db4c42e6f9439146680b0bd057d0d64b672

Test suite: quilt-gb-build-modes: Fixes, passes now

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

diff --git a/debian/tests/control b/debian/tests/control
index e1c48c6d..eefd9027 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -2,11 +2,6 @@ Tests: build-modes-gbp
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, git-buildpackage
 
-Tests: build-modes-sbuild
-Tests-Directory: tests/tests
-Depends: dgit, dgit-infrastructure, devscripts, sbuild
-Restrictions: x-dgit-schroot-build
-
 Tests: dsd-clone-drs
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts
@@ -16,10 +11,10 @@ Tests: mirror mirror-debnewgit mirror-private
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, rsync
 
-Tests: quilt-gbp-build-modes
+Tests: build-modes-sbuild quilt-gbp-build-modes
 Tests-Directory: tests/tests
 Depends: dgit, dgit-infrastructure, devscripts, sbuild
-Restrictions: x-dgit-unfinished x-dgit-schroot-build
+Restrictions: x-dgit-schroot-build
 
 Tests: build-modes build-modes-asplit build-modes-gbp-asplit clone-gitnosuite clone-nogit debpolicy-dbretry debpolicy-newreject distropatches-reject drs-clone-nogit drs-push-masterupdate drs-push-rejects dsd-clone-nogit dsd-divert fetch-localgitonly fetch-somegit-notlast inarchivecopy newtag-clone-nogit oldtag-clone-nogit push-buildproductsdir push-newpackage push-nextdgit quilt quilt-gbp quilt-singlepatch rpush tag-updates test-list-uptodate trustingpolicy-replay
 Tests-Directory: tests/tests
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