X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=ee4bfd07bfdc145e31b60a9dc1af312c2f3e01fa;hb=b0e8004aa91bc35ab21a195ed3696134b102427a;hp=3ddb98051e85890572809e56172575275433e13f;hpb=a56fc8384e1aaae7d279b74269b706156a6da962;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 3ddb9805..ee4bfd07 100644
--- a/tests/lib
+++ b/tests/lib
@@ -42,6 +42,8 @@ if [ x"$tmp" = x ]; then
 	tmp=tests/tmp/$testname
 	rm -rf $tmp
 	mkdir $tmp
+elif [ "x$DGIT_TEST_TMPBASE" != x ]; then
+	tmpbase="$DGIT_TEST_TMPBASE"
 fi
 cd $tmp
 
@@ -53,10 +55,6 @@ env -0 >$tmp/.save-env
 
 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
@@ -67,7 +65,7 @@ incoming		= $tmp/incoming
 run_dinstall		= 0
 END
 
-: ${tagpfx:=test-dummy}
+: ${tagpfx:=archive/test-dummy}
 : ${suitespecs:=sid:unstable}
 
 t-git-next-date () {
@@ -280,7 +278,7 @@ t-archive-updated () {
 
 t-archive-process-incoming () {
 	local suite=$1
-	mv $tmp/incoming/${p}_${v}[._]* $tmp/mirror/pool/main/
+	mv $tmp/incoming/${p}_* $tmp/mirror/pool/main/
 	t-archive-query "$suite"
 }
 
@@ -381,7 +379,8 @@ t-setup-done () {
 	local savedirs=$2
 	local importeval=$3
 
-	exec 4>$tmp/IMPORT.new
+	local import=IMPORT.${0##*/}
+	exec 4>$tmp/$import.new
 
 	local vn
 	for vn in $savevars; do
@@ -390,11 +389,11 @@ t-setup-done () {
 		' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
 	done
 
-	(set -e; cd $tmp; tar cf IMPORT.tar $savedirs)
+	(set -e; cd $tmp; tar cf $import.tar $savedirs)
 
 	printf >&4 "\n%s\n" "$importeval"
 
-	mv -f $tmp/IMPORT.new $tmp/IMPORT
+	mv -f $tmp/$import.new $tmp/$import
 }
 
 t-setup-import () {
@@ -412,7 +411,7 @@ t-setup-import () {
 		lock="$setupsrc.lock"
 	fi
 
-	local simport="$setupsrc/IMPORT"
+	local simport="$setupsrc/IMPORT.$setupname"
 
 	if ! [ -e "$simport" ]; then
 		with-lock-ex -w "$lock" \
@@ -826,7 +825,7 @@ t-drs () {
  t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S "
  t-git-config dgit-distro.test-dummy.git-check true
  t-git-config dgit-distro.test-dummy.git-create true
- t-git-config dgit-distro.test-dummy.dgit-tag-format old,new
+ t-git-config dgit-distro.test-dummy.dgit-tag-format new,old,maint
 	cp $troot/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
 	cp $troot/suites $tmp/.
 	cp $troot/suites $tmp/suites-master
@@ -853,6 +852,7 @@ t-newtag () {
  t-git-config dgit-distro.test-dummy.dgit-tag-format new,maint
 }
 t-oldtag () {
+ export tagpfx=test-dummy
  t-git-config dgit-distro.test-dummy.dgit-tag-format old
 }
 
@@ -924,6 +924,7 @@ t-chain-test () {
 	local d=${0%/*}
 	cd $root
 	export DGIT_TEST_TESTNAME="$testname"
+	export DGIT_TEST_TMPBASE="$tmpbase"
 	export ADTTMP=$tmp
 	exec "$d/$ct"
 }	
@@ -933,3 +934,8 @@ t-alt-test () {
 	t-${t%%-*}
 	t-chain-test "${t#*-}"
 }
+
+case "$0" in
+*/gnupg) ;;
+*)	t-setup-import gnupg	;;
+esac