From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 22 Jun 2019 23:04:25 +0000 (+0100)
Subject: test suite: t-{unapplied,dpm}-pushed-good: set $suite
X-Git-Tag: archive/debian/9.0~111
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=ee6a630c930cc74e00a0ff35561259aef1d455b8;hp=9d8d3f33124550239ceda34e6b6dbf14a4db77ec;p=dgit.git

test suite: t-{unapplied,dpm}-pushed-good: set $suite

t-pushed-good-core wants suite to be set.  Rather than having it
implicit, make it an argument.  Fix the two call sites where suite was
not trivially `sid'.

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

diff --git a/tests/lib b/tests/lib
index fa553af9..616725dc 100644
--- a/tests/lib
+++ b/tests/lib
@@ -826,12 +826,14 @@ t-gbp-pushed-good () {
 }
 
 t-unapplied-pushed-good () {
+	local suite=${1:-sid}
 	t-splitbrain-pushed-good-start
 	t-splitbrain-pushed-good--unpack --skip-patches
 	t-splitbrain-pushed-good-end-made-dep14
 }
 
 t-dpm-pushed-good () {
+	local suite=${1:-sid}
 	t-splitbrain-pushed-good-start
 	t-splitbrain-pushed-good--unpack
 	t-splitbrain-rm-gitignore-patch
diff --git a/tests/tests/quilt-splitbrains b/tests/tests/quilt-splitbrains
index 6886cf89..3ab4572d 100755
--- a/tests/tests/quilt-splitbrains
+++ b/tests/tests/quilt-splitbrains
@@ -29,7 +29,7 @@ want-success () {
 	t-dgit "$@" --quilt=$qmode --dgit-view-save=split.b build-source
 
 	t-dgit "$@" --quilt=$qmode --dgit-view-save=split.p push
-	t-$qmode-pushed-good
+	t-$qmode-pushed-good $suite
 }