changelog: start 9.14

[dgit.git] / tests / tests / baredebian-push

diff --git a/tests/tests/baredebian-push b/tests/tests/baredebian-push
index bfbf9e919d8f2636e8fdc3aae4cc18557e318f81..f0956012b9568be692b656db4a2933497b2d80c9 100755 (executable)
--- a/tests/tests/baredebian-push
+++ b/tests/tests/baredebian-push
@@ -1,73 +1,14 @@
 #!/bin/bash
 set -e
 . tests/lib
+. $troot/lib-baredebian
 
-t-dependencies GDR DEBORIG quilt
+t-dependencies quilt
 
 t-setup-import baredebian
 t-tstunt-parsechangelog
 
 cd $p
-
-t-expect-fail 'contradicts clean mode git-ff' \
-t-dgit -wgf --dgit-view-save=split.f1 --baredebian quilt-fixup
-
-t-dgit -wn --dgit-view-save=split.f1 --baredebian quilt-fixup
-
-v=1.0-1
-suite=sid
-
-tar --strip-components=1 -axf ../${p}_${v%-*}.orig.tar.*
-
-cd debian
-git clean -xdff
-git checkout HEAD -- .
-cd ..
-
-# Now we are in this insane state that people seem to expect
-
-export QUILT_PATCHES=debian/patches
-quilt push -a
-
-git add -Af .
-git reset .pc
-git diff --cached --exit-code split.f1 -- :/ :!/debian
-git diff --exit-code HEAD..split.f1 -- :/debian
-git reset
-
-quilt new made-with-quilt
-quilt add src.c
-echo //omg >>src.c
-quilt refresh
-
-git add debian/patches/.
-t-commit 'extra patch made with quilt' 1.0-2
-
-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=baredebian --dgit-view-save=split.b quilt-fixup
-t-dgit -wn --quilt=baredebian --dgit-view-save=split.p --new push
-
-git merge-base --is-ancestor v${v%-*} split.p
-git merge-base --is-ancestor HEAD     split.p
-set +e; git merge-base HEAD v${v%-*}; rc=$?; set -e; [ $rc = 1 ]
-
-git clean -xdff
-# t-pushed-good-* wants a clean tree to start with, but this
-#  workflow expects a mess
-
-t-splitbrain-pushed-good-start
-t-splitbrain-pushed-good--unpack
-
-find . -mindepth 1 -maxdepth 1         \
-       \! -path ./debian               \
-       \! -path ./.git                 \
-       -print0                         \
-       | xargs -0r rm -rf --
-
-t-splitbrain-pushed-good-end-made-dep14
+baredebian-test
 
 t-ok