test suite: lib-gdr: Break out t-gdr-prep-new-upstream

This does not include `git tag' for the upstream, because
gdr-newupstream wants to test the case where the tag is missing.

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

diff --git a/tests/lib-gdr b/tests/lib-gdr
index 1bb810fef4445ed046d078973d3fd0312333bd62..849e3f642d5e6ae3385efab70c71421122f513c6 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -291,3 +291,14 @@ t-nmu-reconciled-good () {
        git checkout master
        t-dgit -wgf quilt-fixup
 }
+
+t-gdr-prep-new-upstream () {
+       uv=$1
+       t-git-next-date
+       git checkout make-upstream
+       git reset --hard upstream
+       t-make-new-upstream-tarball $uv
+       git push . make-upstream:upstream
+       git checkout master
+       t-git-next-date
+}

diff --git a/tests/tests/gdr-newupstream b/tests/tests/gdr-newupstream
index ada5516882f37df74bf4bf532f3f6c28133a8bee..0724459ea8fc9a9dbfbc83eb61dcf50d45634ef6 100755 (executable)
--- a/tests/tests/gdr-newupstream
+++ b/tests/tests/gdr-newupstream
@@ -12,18 +12,7 @@ cd $p
 
 : 'upstream hat'
 
-new-upstream () {
-       uv=$1
-       t-git-next-date
-       git checkout make-upstream
-       git reset --hard upstream
-       t-make-new-upstream-tarball $uv
-       git push . make-upstream:upstream
-       git checkout master
-       t-git-next-date
-}
-
-new-upstream 2.1
+t-gdr-prep-new-upstream 2.1
 
 : 'maintainer hat'