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

diff --git a/tests/lib b/tests/lib
index dc0911b8..cccdc35d 100644
--- a/tests/lib
+++ b/tests/lib
@@ -3,6 +3,12 @@
 exec 2>&1
 set -x
 
+if [ "x$DGIT_TEST_INTREE" != x ]; then
+	: ${DGIT_TEST:=$DGIT_TEST_INTREE/dgit}
+	: ${DGIT_REPOS_SERVER_TEST:=$DGIT_TEST_INTREE/dgit-repos-server}
+	export DGIT_TEST DGIT_REPOS_SERVER_TEST
+fi
+
 root=`pwd`
 troot=$root/tests
 testname="${DGIT_TEST_TESTNAME-${0##*/}}"
@@ -39,16 +45,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 () {
@@ -71,30 +88,41 @@ 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 () {
+	local dgit=${DGIT_TEST-dgit}
 	: '
-
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
-	${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
-		-dtest-dummy $DGIT_TEST_OPTS -D -k39B13D8A "$@"
+	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
+		-dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \
+		-k39B13D8A "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
 
 t-diff-nogit () {
-	diff --exclude=.git -ruN $*
+	diff --exclude=.git --exclude=.pc -ruN $*
 }
 
 t-cloned-fetched-good () {
@@ -227,9 +255,11 @@ 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
+	cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
+	cp $root/tests/suites $tmp/.
 }
 
 t-drs-test () {
@@ -239,4 +269,3 @@ t-drs-test () {
 	export ADTTMP=$tmp
 	exec "${0///drs-//}" "$@"
 }
-