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

[dgit.git] / tests / lib-baredebian

diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index abec753af6c78f1ed8df7ddf12fc7b50518462ee..3ef6569d9474dc0ed9f973cfe9dfdc845dfda04f 100644 (file)
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -6,6 +6,8 @@ baredebian-test-vars () {
        suite=sid
        uv=${v%-*}
        uvtag=v$uv
+       origbase=${p}_${uv}.orig
+       xorigcomps=''
 }
 
 baredebian-tarball-mode () {
@@ -14,13 +16,21 @@ 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
+}
 
-       tar --strip-components=1 -axf ../${p}_${uv}.orig.tar.*
+baredebian-test-core () {
+       tar --strip-components=1 -axf ../$origbase.tar.*
+       for comp in $xorigcomps; do
+               mkdir $comp
+               cd $comp
+               tar --strip-components=1 -axf ../../$origbase-$comp.tar.*
+               cd ..
+       done
 
        cd debian
        git clean -xdff
@@ -78,5 +88,6 @@ baredebian-test-core () {
 
 baredebian-test () {
        baredebian-test-vars
+       baredebian-test-minimum
        baredebian-test-core
 }