diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2019-07-25 07:20:42 +0100 |
| commit | c3b21df9639ae811a7b8c436a34d558917526b47 (patch) | |
| tree | 96b68f3392b1a376bf487c53fafd3d215573ea36 /tests/lib-baredebian | |
| parent | 839b666ac93688e2ef24c3fb7b1fbb0a0024bb33 (diff) | |
| parent | 97d91ead98b8c771271e1b6878b14db030932560 (diff) | |
Merge tag 'debian/9.5' into buster-bpo
dgit release 9.5 for unstable (sid) [dgit]
[dgit distro=debian no-split]
# gpg: Signature made Mon 22 Jul 2019 09:40:00 PM BST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
Diffstat (limited to 'tests/lib-baredebian')
| -rw-r--r-- | tests/lib-baredebian | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/tests/lib-baredebian b/tests/lib-baredebian index 3ef6569..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 @@ -56,14 +56,22 @@ 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 +} +baredebian-test-core-postpush () { git merge-base --is-ancestor HEAD split.p if [ "$uvtag" ]; then git merge-base --is-ancestor $uvtag split.p @@ -86,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 |