test suite: baredebian: move setting of $quiltmode to lib

[dgit.git] / tests / lib-baredebian

diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index f3ee03e8f11065e81f09694f700876d7b7dc354a..d3af727608e261e45071d84605b91231b84840dc 100644 (file)
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -1,10 +1,12 @@
 #
 
 baredebian-test () {
+       quiltmode=baredebian
+
        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 +42,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