From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 29 Jun 2019 14:55:44 +0000 (+0100)
Subject: test suite: lib-baredebian: Split up big function
X-Git-Tag: archive/debian/9.0~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=0987f3f5937ffd047cf09aea5084f857cabd8c0c

test suite: lib-baredebian: Split up big function

No functional change.

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

diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index d3af7276..762e7e25 100644
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -1,16 +1,17 @@
 #
 
-baredebian-test () {
+baredebian-test-vars () {
 	quiltmode=baredebian
+	v=1.0-1
+	suite=sid
+}
 
+baredebian-test-core () {
 	t-expect-fail 'contradicts clean mode git-ff' \
 	t-dgit -wgf --dgit-view-save=split.f1 --$quiltmode quilt-fixup
 
 	t-dgit -wn --dgit-view-save=split.f1 --$quiltmode quilt-fixup
 
-	v=1.0-1
-	suite=sid
-
 	tar --strip-components=1 -axf ../${p}_${v%-*}.orig.tar.*
 
 	cd debian
@@ -64,3 +65,8 @@ baredebian-test () {
 
 	t-splitbrain-pushed-good-end-made-dep14
 }
+
+baredebian-test () {
+	baredebian-test-vars
+	baredebian-test-core
+}