diff options
| -rw-r--r-- | tests/lib-baredebian | 8 | ||||
| -rwxr-xr-x | tests/tests/baredebian-push | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/lib-baredebian b/tests/lib-baredebian index f3ee03e..c9fc44f 100644 --- a/tests/lib-baredebian +++ b/tests/lib-baredebian @@ -2,9 +2,9 @@ baredebian-test () { t-expect-fail 'contradicts clean mode git-ff' \ - t-dgit -wgf --dgit-view-save=split.f1 --baredebian quilt-fixup + t-dgit -wgf --dgit-view-save=split.f1 --$quiltmode quilt-fixup - t-dgit -wn --dgit-view-save=split.f1 --baredebian quilt-fixup + t-dgit -wn --dgit-view-save=split.f1 --$quiltmode quilt-fixup v=1.0-1 suite=sid @@ -40,8 +40,8 @@ baredebian-test () { # (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 + 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 git merge-base --is-ancestor HEAD split.p diff --git a/tests/tests/baredebian-push b/tests/tests/baredebian-push index d0ecf93..c7f7b2b 100755 --- a/tests/tests/baredebian-push +++ b/tests/tests/baredebian-push @@ -8,6 +8,8 @@ t-dependencies GDR DEBORIG quilt t-setup-import baredebian t-tstunt-parsechangelog +quiltmode=baredebian + cd $p baredebian-test |