diff options
| author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-10 07:45:22 +0100 |
|---|---|---|
| committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-10 12:35:13 +0100 |
| commit | 91c2126e5ab7bea38708933c9281c12c814bb200 (patch) | |
| tree | 6368b86dc2419822ff987b0e089359c44c4504b7 /tests | |
| parent | a676bb68111e13736dd58b4d08c754d6150e359e (diff) | |
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>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib-gdr | 11 | ||||
| -rwxr-xr-x | tests/tests/gdr-newupstream | 13 |
2 files changed, 12 insertions, 12 deletions
diff --git a/tests/lib-gdr b/tests/lib-gdr index 1bb810f..849e3f6 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 ada5516..0724459 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' |