test suite: Break out t-non-dgit-upload

No functional change.

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

diff --git a/tests/lib b/tests/lib
index c788744b543ced2daccbb407ab0cd44ebd47477e..8392e79a5cfe779e61f3aa6b96c4772c06773570 100644 (file)
--- a/tests/lib
+++ b/tests/lib
@@ -476,6 +476,19 @@ t-dgit () {
 '
 }
 
+t-non-dgit-upload () {
+       t-dgit -wgf build-source
+
+       cd ..
+       c=${p}_${v}_source.changes
+       debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
+       dput -c $tmp/dput.cf test-dummy $c
+
+       t-archive-process-incoming sid
+       t-git-next-date
+       cd $p
+}
+
 t-dgit-manpage () {
        local section=$1
        local page=$2

diff --git a/tests/lib-gdr b/tests/lib-gdr
index cda11df5b8d5fe7d322d9f8f8168cc44c2554746..bf94fbaedc4c21529b705af2bc0b561cd13b4ddb 100644 (file)
--- a/tests/lib-gdr
+++ b/tests/lib-gdr
@@ -260,17 +260,7 @@ t-nmu-upload-2 () {
 
 t-nmu-upload-3 () {
        t-dch-commit-r
-
-       t-dgit -wgf build-source
-
-       cd ..
-       c=${p}_${v}_source.changes
-       debsign -kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $c
-       dput -c $tmp/dput.cf test-dummy $c
-
-       t-archive-process-incoming sid
-       t-git-next-date
-       cd $p
+       t-non-dgit-upload
        git checkout master
 }