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: Fix trustingpolicy-replay & dput-ng.
[dgit.git]
/
tests
/
lib
diff --git
a/tests/lib
b/tests/lib
index bc9e8c72fdc673f77b2d97a1c55ebfaf0d081c87..4ef275ca1641f62804675c91ab1cf516b66d5692 100644
(file)
--- a/
tests/lib
+++ b/
tests/lib
@@
-41,6
+41,7
@@
export DGIT_TEST_TROOT=$troot
tmp=$ADTTMP
if [ x"$tmp" = x ]; then
tmp=$ADTTMP
if [ x"$tmp" = x ]; then
+ export DGIT_TEST_BYHAND=1
mkdir -p tests/tmp
tmpbase=$troot/tmp
tmp=tests/tmp/$testname
mkdir -p tests/tmp
tmpbase=$troot/tmp
tmp=tests/tmp/$testname
@@
-152,7
+153,7
@@
t-reporefs () {
exec >"$outputfile"
if test -d $whichrepo; then
cd $whichrepo
exec >"$outputfile"
if test -d $whichrepo; then
cd $whichrepo
- git show-ref |sort
+ git show-ref |
t-
sort
fi)
}
fi)
}
@@
-480,12
+481,12
@@
t-setup-done () {
local savedirs=$2
local importeval=$3
local savedirs=$2
local importeval=$3
- local import=IMPORT.${
0##*/
}
+ local import=IMPORT.${
DGIT_TEST_TESTNAME-${0##*/}
}
exec 4>$tmp/$import.new
local vn
for vn in $savevars; do
exec 4>$tmp/$import.new
local vn
for vn in $savevars; do
- perl >&4 -
I.
-MDebian::Dgit -e '
+ perl >&4 -
"I$root"
-MDebian::Dgit -e '
printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1]
' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
done
printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1]
' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
done
@@
-1134,7
+1135,11
@@
t-alt-test () {
t-git-config dgit.default.old-dsc-distro test-dummy
t-git-config dgit.default.old-dsc-distro test-dummy
-case "$0" in
-*/gnupg) ;;
-*) t-setup-import gnupg ;;
-esac
+for import in ${autoimport-gnupg}; do
+ case "$0" in
+ */$import) ;;
+ *)
+ t-setup-import $import
+ ;;
+ esac
+done