X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=5e64b99cd577b58bf6ddee4e4a421773a16be3ee;hb=8b67402e788511056cae31748a1ffafdabb4a9fb;hp=b80989d676946511fb3143b9a6f41d3ce8868de0;hpb=e29e052f34677e876f86e317f20d784c765f5c5a;p=dgit.git

diff --git a/tests/lib b/tests/lib
index b80989d6..5e64b99c 100644
--- a/tests/lib
+++ b/tests/lib
@@ -5,7 +5,7 @@ set -x
 
 root=`pwd`
 troot=$root/tests
-testname="${0##*/}"
+testname="${DGIT_TEST_TESTNAME-${0##*/}}"
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
@@ -15,16 +15,18 @@ if [ x"$tmp" = x ]; then
 	mkdir $tmp
 fi
 cd $tmp
+export HOME=$tmp
+
 tmp=`pwd`
 export DGIT_TEST_DUMMY_DIR=$tmp
-ln $troot/ssh ssh
+ln -f $troot/ssh ssh
 
-mkdir $tmp/gnupg
+mkdir -p $tmp/gnupg
 cp $troot/gnupg/* $tmp/gnupg
 chmod go-rw $tmp/gnupg/*
 export GNUPGHOME=$tmp/gnupg
 
-mkdir $tmp/incoming
+mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
 [test-dummy]
 method			= local
@@ -37,16 +39,27 @@ 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 () {
 	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
+	(set -e; cd $tmp/git; t-untar $gs)
 }
 
 t-git-none () {
@@ -69,23 +82,37 @@ t-archive-none () {
 	echo sid >$tmp/aq/suite.unstable
 }
 
+t-archive-process-incoming () {
+	mv incoming/${p}_${v}[._]* mirror/
+	t-archive-query
+}
+
+t-archive-query () {
+	local dscf=${p}_${v}.dsc
+	echo "${v} $dscf" >>$tmp/aq/package.sid.${p}
+}
+
 t-archive () {
 	t-archive-none $1
 	v=$2
 	local dscf=${p}_$2.dsc
 	rm -f $tmp/mirror/${p}_*
 	ln $troot/pkg-srcs/${p}_${2%-*}* $tmp/mirror/
-	echo "$2 $dscf" >>$tmp/aq/package.sid.${p}
+	t-archive-query
 	rm -rf $tmp/extract
 	mkdir $tmp/extract
 	(set -e; cd $tmp/extract; dpkg-source -x ../mirror/$dscf)
 }
 
 t-dgit () {
-	: '{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
+	: '
+
+{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
-		-dtest-dummy -D -k39B13D8A "$@"
-	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}'
+		-dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \
+		-k39B13D8A "$@"
+	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
+'
 }
 
 t-diff-nogit () {
@@ -214,3 +241,25 @@ t-apply-diff () {
 	(cd $troot/pkg-srcs; debdiff ${p}_${v1}.dsc ${p}_${v2}.dsc) \
 		| patch -p1 -u
 }
+
+t-git-config () {
+	git config --global "$@"
+}
+
+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 %S "
+ t-git-config dgit-distro.test-dummy.git-check true
+ t-git-config dgit-distro.test-dummy.git-create true
+	cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
+	cp $root/tests/suites $tmp/.
+}
+
+t-drs-test () {
+	t-drs
+	cd $root
+	export DGIT_TEST_TESTNAME="$testname"
+	export ADTTMP=$tmp
+	exec "${0///drs-//}" "$@"
+}