chiark
/
gitweb
/
~ianmdlvl
/
dgit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Test suite: overwrite junk: Use $tagpfx where applicable
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index fe8d8fc01ab5aa51a7c361113777a13a68bd4afa..39763c6169430058237f1b3d5752b072866798f6 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-42,6
+42,8
@@
if [ x"$tmp" = x ]; then
tmp=tests/tmp/$testname
rm -rf $tmp
mkdir $tmp
tmp=tests/tmp/$testname
rm -rf $tmp
mkdir $tmp
+elif [ "x$DGIT_TEST_TMPBASE" != x ]; then
+ tmpbase="$DGIT_TEST_TMPBASE"
fi
cd $tmp
fi
cd $tmp
@@
-53,10
+55,6
@@
env -0 >$tmp/.save-env
ln -f $troot/ssh ssh
ln -f $troot/ssh ssh
-mkdir -p $tmp/gnupg
-cp $troot/gnupg/* $tmp/gnupg
-chmod go-rw $tmp/gnupg/*
-
export DEBCHANGE_VENDOR=dpkg
mkdir -p $tmp/incoming
export DEBCHANGE_VENDOR=dpkg
mkdir -p $tmp/incoming
@@
-925,6
+923,7
@@
t-chain-test () {
local d=${0%/*}
cd $root
export DGIT_TEST_TESTNAME="$testname"
local d=${0%/*}
cd $root
export DGIT_TEST_TESTNAME="$testname"
+ export DGIT_TEST_TMPBASE="$tmpbase"
export ADTTMP=$tmp
exec "$d/$ct"
}
export ADTTMP=$tmp
exec "$d/$ct"
}
@@
-934,3
+933,8
@@
t-alt-test () {
t-${t%%-*}
t-chain-test "${t#*-}"
}
t-${t%%-*}
t-chain-test "${t#*-}"
}
+
+case "$0" in
+*/gnupg) ;;
+*) t-setup-import gnupg ;;
+esac