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 123ce35a0b3bec7eb6f5548d83e6638e4855c006..3ef6569d9474dc0ed9f973cfe9dfdc845dfda04f 100644 (file)
--- 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 6405871fb9ff51b7a3975b05a7f751ce3d701aad..39b6668507ccc52fecacc199bf51fbb25a4cbba4 100755 (executable)
--- 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 fa05d4c717f4555ee0b4d96ca065659fe4e60430..00b2ad292b71e78e45d9d5a8b42c6bd029643100 100755 (executable)
--- 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