From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 29 Jun 2019 12:04:16 +0000 (+0100)
Subject: test suite: baredebian-push: Actually test --quilt=baredebian
X-Git-Tag: archive/debian/9.0~65
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=feb41b460160207b7454df868022ca3edffb14ce;p=dgit.git

test suite: baredebian-push: Actually test --quilt=baredebian

This is all quite awful really.  I think that is inherent.

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

diff --git a/tests/tests/baredebian-push b/tests/tests/baredebian-push
index 9b7e59ba..7dfee4bc 100755
--- a/tests/tests/baredebian-push
+++ b/tests/tests/baredebian-push
@@ -5,7 +5,62 @@ set -e
 t-dependencies GDR
 
 t-setup-import baredebian
+t-tstunt-parsechangelog
 
-: xxx need some actual code here
+cd $p
+
+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 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
 
 t-ok