summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-30 11:00:22 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2019-06-30 21:11:18 +0100
commita49cc9d6a608f509e551bc954b24136bf48c33ba (patch)
tree35f6153e34ef7d6d9d0d0dea023cb377f46835ef
parentc62b75dc11dbc9afa602972a1317c75d268b85bc (diff)
test suite: baredebian: Break out baredebian-tarball-mode
No functional change. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
-rw-r--r--tests/lib-baredebian6
-rwxr-xr-xtests/tests/baredebian-tarball5
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/lib-baredebian b/tests/lib-baredebian
index 368aa78..abec753 100644
--- a/tests/lib-baredebian
+++ b/tests/lib-baredebian
@@ -8,6 +8,12 @@ baredebian-test-vars () {
uvtag=v$uv
}
+baredebian-tarball-mode () {
+ git tag -d $uvtag
+ uvtag=''
+ quiltmode=baredebian+tarball
+}
+
baredebian-test-core () {
t-expect-fail 'contradicts clean mode git-ff' \
t-dgit -wgf --dgit-view-save=split.f1 --$quiltmode quilt-fixup
diff --git a/tests/tests/baredebian-tarball b/tests/tests/baredebian-tarball
index 6b1a1b6..7acd7b7 100755
--- a/tests/tests/baredebian-tarball
+++ b/tests/tests/baredebian-tarball
@@ -10,10 +10,7 @@ t-tstunt-parsechangelog
cd $p
baredebian-test-vars
-
-quiltmode=baredebian+tarball
-git tag -d $uvtag
-uvtag=''
+baredebian-tarball-mode
t-expect-fail 'Could not determine appropriate upstream commitish' \
t-dgit -wn --dgit-view-save=split.g --baredebian quilt-fixup