X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=fb6b2fc068273ab2989250637a80eb58846d1407;hp=dc0911b8140376775cabf432120889523d7d7868;hb=8e74405f81b62f209f20435970696bb8203bf74b;hpb=4e035e6deb0c676422c6bd91f89ae5b8cad985cb

diff --git a/tests/lib b/tests/lib
index dc0911b8..fb6b2fc0 100644
--- a/tests/lib
+++ b/tests/lib
@@ -48,7 +48,12 @@ t-git () {
 	p=$1
 	v=$2
 	mkdir -p $tmp/git
-	(set -e; cd $tmp/git; tar xf $troot/git-srcs/${p}_$v.git.tar)
+	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
 }
 
 t-git-none () {
@@ -227,9 +232,9 @@ t-git-config () {
 t-drs () {
 	export DGIT_TEST_TROOT=$troot
 	export DGIT_TEST_TMP=$tmp
-	t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext "
-	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.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-drs-test () {
@@ -237,6 +242,7 @@ t-drs-test () {
 	cd $root
 	export DGIT_TEST_TESTNAME="$testname"
 	export ADTTMP=$tmp
+	cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
+	cp $root/tests/suites $tmp/.
 	exec "${0///drs-//}" "$@"
 }
-