From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 30 Jun 2019 21:15:28 +0000 (+0100)
Subject: test suite: baredebian: Break out baredebian-test-minimum
X-Git-Tag: archive/debian/9.0~18
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=commitdiff_plain;h=ff2f54585ff5ab8449af347b89d4ee1ba12a70cc

test suite: baredebian: Break out baredebian-test-minimum

Update all callers.

No functional change.

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

diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 123ce35a..3ef6569d 100644
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -16,12 +16,14 @@ baredebian-tarball-mode () {
 	quiltmode=baredebian+tarball
 }
 
-baredebian-test-core () {
+baredebian-test-minimum () {
 	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
+}
 
+baredebian-test-core () {
 	tar --strip-components=1 -axf ../$origbase.tar.*
 	for comp in $xorigcomps; do
 		mkdir $comp
@@ -86,5 +88,6 @@ baredebian-test-core () {
 
 baredebian-test () {
 	baredebian-test-vars
+	baredebian-test-minimum
 	baredebian-test-core
 }
diff --git a/tests/tests/baredebian-multitar b/tests/tests/baredebian-multitar
index 6405871f..39b66685 100755
--- a/tests/tests/baredebian-multitar
+++ b/tests/tests/baredebian-multitar
@@ -18,6 +18,7 @@ xorigcomps=docs
 
 git tag -d $uvtag
 
+baredebian-test-minimum
 baredebian-test-core
 
 combine=$(
diff --git a/tests/tests/baredebian-tarball b/tests/tests/baredebian-tarball
index fa05d4c7..00b2ad29 100755
--- a/tests/tests/baredebian-tarball
+++ b/tests/tests/baredebian-tarball
@@ -15,6 +15,7 @@ baredebian-tarball-mode
 t-expect-fail 'Could not determine appropriate upstream commitish' \
 t-dgit -wn --dgit-view-save=split.g --baredebian quilt-fixup
 
+baredebian-test-minimum
 baredebian-test-core
 
 t-ok