summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2015-04-19 15:56:47 +0100
committerIan Jackson <ijackson@chiark.greenend.org.uk>2015-05-31 11:54:05 +0100
commita34850cd18a1e8f163f3dda9c8fb6272706a8ea0 (patch)
tree8a2b14ccfaa3d7a33909e02ae9fd614fe474ab8e /tests
parent475e31b775275ac895e21afa4143c10596b512d1 (diff)
Test suite: break out t-prep-newpackage (nfc)
Diffstat (limited to 'tests')
-rw-r--r--tests/lib15
-rwxr-xr-xtests/tests/push-newpackage9
2 files changed, 16 insertions, 8 deletions
diff --git a/tests/lib b/tests/lib
index 1516646..939aa6c 100644
--- a/tests/lib
+++ b/tests/lib
@@ -81,7 +81,20 @@ t-has-ancestor () {
if [ x$mbase != x$ancestor ]; then
fail "not ff $ancestor..$now, $mbase != $ancestor"
fi
-}
+}
+
+t-prep-newpackage () {
+ p=$1
+ v=$2
+ t-archive-none $p
+ t-git-none
+ v=3-1
+ t-worktree $v
+ cd $p
+ git branch -m dgit/sid master
+ git remote rm dgit
+ cd ..
+}
t-archive-none () {
p=$1
diff --git a/tests/tests/push-newpackage b/tests/tests/push-newpackage
index 9954b3f..5d23faa 100755
--- a/tests/tests/push-newpackage
+++ b/tests/tests/push-newpackage
@@ -2,14 +2,9 @@
set -e
. tests/lib
-t-archive-none pari-extra
-t-git-none
-t-worktree 3-1
-v=3-1
-cd $p
-git branch -m dgit/sid master
-git remote rm dgit
+t-prep-newpackage pari-extra 3-1
+cd $p
t-refs-same-start
t-ref-head