diff options
author | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-26 01:18:08 +0100 |
---|---|---|
committer | Ian Jackson <ijackson@chiark.greenend.org.uk> | 2018-08-26 02:21:58 +0100 |
commit | a013d40d737ef70fae7885b5e339660ca112d978 (patch) | |
tree | 61f40e2680d5e008747e64ddaa115fb4c6429f3b /tests | |
parent | 72ce6d23ca6a10fcab21410d202ec8ad5fc2aeb9 (diff) |
test suite: lib-gdr: Factor out t-make-orig
NFC, overall.
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lib | 9 | ||||
-rw-r--r-- | tests/lib-gdr | 4 |
2 files changed, 10 insertions, 3 deletions
@@ -1026,6 +1026,15 @@ t-make-badcommit () { t-expect-fsck-fail $badcommit } +t-make-orig () { + # leaves ust set to filename of orig tarball + local p=$1 + local v=$2 + local tag=${3-v$2} + ust=${p}_${v}.orig.tar.gz + git archive -o ../$ust --prefix=${p}-${v}/ $tag +} + t-merge-conflicted-stripping-conflict-markers () { local otherbranch=$1 local file=$2 diff --git a/tests/lib-gdr b/tests/lib-gdr index 251143e..cda11df 100644 --- a/tests/lib-gdr +++ b/tests/lib-gdr @@ -229,11 +229,9 @@ t-some-changes () { 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 + t-make-orig example $uv make-upstream } t-nmu-upload-1 () { |