summaryrefslogtreecommitdiff
path: root/tests/lib
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2014-02-19 22:05:35 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2014-03-05 18:29:07 +0000
commit2ba1d04106ad92d32e7614ad9d94fce48c363076 (patch)
tree82fa754ac8e348d39239a7625c830ad65da58ec0 /tests/lib
parentc0d3371a902372662e911a1df080f0ffa17b6b72 (diff)
tests/lib: break out t-untar and use it in t-worktree
Diffstat (limited to 'tests/lib')
-rw-r--r--tests/lib18
1 files changed, 12 insertions, 6 deletions
diff --git a/tests/lib b/tests/lib
index fb6b2fc..2dffdac 100644
--- a/tests/lib
+++ b/tests/lib
@@ -39,9 +39,19 @@ fail () {
exit 1
}
+t-untar () {
+ local tarfile=$1.tar
+ local edittree=$1.edit
+ if test -d "$edittree"; then
+ cp -al "$edittree"/* .
+ else
+ tar xf "$tarfile"
+ fi
+}
+
t-worktree () {
rm -rf $p
- tar xf $troot/worktrees/${p}_$1.tar
+ t-untar $troot/worktrees/${p}_$1
}
t-git () {
@@ -49,11 +59,7 @@ t-git () {
v=$2
mkdir -p $tmp/git
local gs=$troot/git-srcs/${p}_$v.git
- if test -f $gs.edit; then
- cp -al $gs.edit $tmp/git/${p}.git
- else
- (set -e; cd $tmp/git; tar xf $gs.tar)
- fi
+ (set -e; cd $tmp/git; t-untar $gs)
}
t-git-none () {