summaryrefslogtreecommitdiff
path: root/tests/lib-baredebian
diff options
context:
space:
mode:
Diffstat (limited to 'tests/lib-baredebian')
-rw-r--r--tests/lib-baredebian12
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 61db972..557c051 100644
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -23,7 +23,7 @@ baredebian-test-minimum () {
t-dgit -wn --dgit-view-save=split.f1 --$quiltmode quilt-fixup
}
-baredebian-test-core () {
+baredebian-test-core-prepush () {
tar --strip-components=1 -axf ../$origbase.tar.*
for comp in $xorigcomps; do
mkdir $comp
@@ -60,14 +60,18 @@ baredebian-test-core () {
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.p --new push
+}
+baredebian-test-core-postpush () {
git merge-base --is-ancestor HEAD split.p
if [ "$uvtag" ]; then
git merge-base --is-ancestor $uvtag split.p
@@ -90,6 +94,12 @@ 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