From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 26 Aug 2018 00:18:08 +0000 (+0100)
Subject: test suite: lib-gdr: Factor out t-make-orig
X-Git-Tag: archive/debian/6.10~22
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a013d40d737ef70fae7885b5e339660ca112d978;p=dgit.git

test suite: lib-gdr: Factor out t-make-orig

NFC, overall.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/tests/lib b/tests/lib
index 42e1344d..9693c253 100644
--- a/tests/lib
+++ b/tests/lib
@@ -1026,6 +1026,15 @@ t-make-badcommit () {
 	t-expect-fsck-fail $badcommit
 }
 
+t-make-orig () {
+	# leaves ust set to filename of orig tarball
+	local p=$1
+	local v=$2
+	local tag=${3-v$2}
+	ust=${p}_${v}.orig.tar.gz
+	git archive -o ../$ust --prefix=${p}-${v}/ $tag
+}
+
 t-merge-conflicted-stripping-conflict-markers () {
 	local otherbranch=$1
 	local file=$2
diff --git a/tests/lib-gdr b/tests/lib-gdr
index 251143e3..cda11df5 100644
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -229,11 +229,9 @@ t-some-changes () {
 t-make-new-upstream-tarball () {
 	local uv=$1
 	git checkout make-upstream
-	# leaves ust set to filename of orig tarball
 	echo "upstream $uv" >>docs/README
 	git commit -a -m "upstream $uv tarball"
-	ust=example_$uv.orig.tar.gz
-	git archive -o ../$ust --prefix=example-2.0/ make-upstream
+	t-make-orig example $uv make-upstream
 }
 
 t-nmu-upload-1 () {