From 58b7d7f0caa57fb3e7d0f7a69c9d5cb60ae23de2 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 29 Jun 2019 15:52:52 +0100 Subject: [PATCH] test suite: lib-baredebian: Introduce $quiltmode No functional change. Signed-off-by: Ian Jackson --- tests/lib-baredebian | 8 ++++---- tests/tests/baredebian-push | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/lib-baredebian b/tests/lib-baredebian index f3ee03e8..c9fc44f7 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 d0ecf936..c7f7b2bd 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 -- 2.30.2