From 91c2126e5ab7bea38708933c9281c12c814bb200 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 10 Aug 2018 07:45:22 +0100 Subject: [PATCH] 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 --- tests/lib-gdr | 11 +++++++++++ tests/tests/gdr-newupstream | 13 +------------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/lib-gdr b/tests/lib-gdr index 1bb810fe..849e3f64 100644 --- 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 ada55168..0724459e 100755 --- 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' -- 2.30.2