dgit.1: drop remark about sbuild not building arch-independent

[dgit.git] / tests / lib-baredebian

diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 762e7e259b49b09ffba4b07c4b42fa1f3248d1f4..557c051af0030de9bef8b1d91096b2735b23f781 100644 (file)
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -4,15 +4,33 @@ baredebian-test-vars () {
        quiltmode=baredebian
        v=1.0-1
        suite=sid
+       uv=${v%-*}
+       uvtag=v$uv
+       origbase=${p}_${uv}.orig
+       xorigcomps=''
 }
 
-baredebian-test-core () {
+baredebian-tarball-mode () {
+       git tag -d $uvtag
+       uvtag=''
+       quiltmode=baredebian+tarball
+}
+
+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}_${v%-*}.orig.tar.*
+baredebian-test-core-prepush () {
+       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
@@ -38,17 +56,27 @@ baredebian-test-core () {
        git add debian/patches/.
        t-commit 'extra patch made with quilt' 1.0-2
 
+       t-refs-same-start
+       t-ref-head
+       t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.b quilt-fixup
+       t-ref-head
+}
+
+baredebian-test-core-push () {
        dpkg-buildpackage -uc -us --build=source
        # ^ Do this by hand here not because we expect users to do this
        #   (rather than dgit build), but so that we can check that our
        #   output is the same as users are used to.
 
-       t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.b quilt-fixup
        t-dgit -wn --quilt=$quiltmode --dgit-view-save=split.p --new push
+}
 
-       git merge-base --is-ancestor v${v%-*} split.p
+baredebian-test-core-postpush () {
        git merge-base --is-ancestor HEAD     split.p
-       set +e; git merge-base HEAD v${v%-*}; rc=$?; set -e; [ $rc = 1 ]
+       if [ "$uvtag" ]; then
+               git merge-base --is-ancestor $uvtag split.p
+               set +e; git merge-base HEAD $uvtag; rc=$?; set -e; [ $rc = 1 ]
+       fi
 
        git clean -xdff
        # t-pushed-good-* wants a clean tree to start with, but this
@@ -66,7 +94,14 @@ baredebian-test-core () {
        t-splitbrain-pushed-good-end-made-dep14
 }
 
+baredebian-test-core () {
+       baredebian-test-core-prepush
+       baredebian-test-core-push
+       baredebian-test-core-postpush
+}
+
 baredebian-test () {
        baredebian-test-vars
+       baredebian-test-minimum
        baredebian-test-core
 }