git-debrebase: test suite: introduce t-make-new-upstream-tarball

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index ed55ecf41613ecfe9aa932b73c7eb12a244df424..74c571ab7743aa2bd7e705a96ec06f943206ddb7 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -108,3 +108,13 @@ t-some-changes () {
        done
        git commit -m "MIXED add both ($token)"
 }
+
+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
+}

diff --git a/tests/setup/gbp2gdr b/tests/setup/gbp2gdr
index 2dbb51548af5f928efd2d9e08ff79695494ae7e4..ac949dfa0d2f0dfbbd3553340f918cbcaf09ca67 100755 (executable)
--- a/tests/setup/gbp2gdr
+++ b/tests/setup/gbp2gdr
@@ -37,11 +37,8 @@ git commit -m "patch queue update ($0)"
 not-gdr-processable
 
 : 'fake up an upstream 2.0'
-git checkout -b make-upstream upstream
-echo upstream-v2 >>docs/README
-git commit -a -m "an upstream v2 update"
-ust=example_2.0.orig.tar.gz
-git archive -o ../$ust --prefix=example-2.0/ make-upstream
+git branch make-upstream upstream
+t-make-new-upstream-tarball 2.0
 
 : 'make branch names more conventional'
 git branch -D master