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

diff --git a/tests/lib b/tests/lib
index 2dffdace..5e64b99c 100644
--- a/tests/lib
+++ b/tests/lib
@@ -82,13 +82,23 @@ 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)
@@ -99,7 +109,8 @@ t-dgit () {
 
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	${DGIT_TEST-dgit} --dget:-u --dput:--config=$tmp/dput.cf \
-		-dtest-dummy $DGIT_TEST_OPTS -D -k39B13D8A "$@"
+		-dtest-dummy $DGIT_TEST_OPTS ${DGIT_TEST_DEBUG--D} \
+		-k39B13D8A "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
@@ -241,6 +252,8 @@ 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
+	cp $root/tests/gnupg/{dd.gpg,dm.gpg,dm.txt} $tmp/.
+	cp $root/tests/suites $tmp/.
 }
 
 t-drs-test () {
@@ -248,7 +261,5 @@ 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-//}" "$@"
 }