X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=68bf9d7353726fe18a393dbbd7b10cee8b81d8b7;hp=40f1f0992e50080022aba595a39ea42dfab13ae1;hb=94d16b0ad7ba31cb0bef2f6083145b11b5640e31;hpb=3aa2ab5f285a1675dece0cd3b4f594e94b7ecb9e

diff --git a/tests/lib b/tests/lib
index 40f1f099..68bf9d73 100644
--- a/tests/lib
+++ b/tests/lib
@@ -40,6 +40,7 @@ root=`pwd`
 troot=$root/tests
 testname="${DGIT_TEST_TESTNAME-${0##*/}}"
 export DGIT_TEST_TROOT=$troot
+bpd=..
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
@@ -64,6 +65,7 @@ env -0 >$tmp/.save-env
 ln -f $troot/ssh ssh
 
 export DEBCHANGE_VENDOR=dpkg
+unset VISUAL
 
 mkdir -p $tmp/incoming
 cat <<END >$tmp/dput.cf
@@ -73,6 +75,9 @@ incoming		= $tmp/incoming
 run_dinstall		= 0
 END
 
+schroot=${DGIT_SCHROOT_CHROOT:-build}
+# Pretty much any Debian sid snapshot schroot will do.
+
 : ${t_archive_method:=aq}
 : ${tagpfx:=archive/test-dummy}
 : ${suitespecs:=sid:unstable}
@@ -419,10 +424,8 @@ t-save-artifacts () {
 	artifacts="$AUTOPKGTEST_ARTIFACTS"
 	if [ x"$artifacts" = x ]; then return; fi
 	if [ x"tmp" = x ]; then return; fi
-	: '(((((((((( t-save-artifacts ))))))))))'
 	GZIP=-1v tar -C "$tmp" -zc -f "$artifacts/${0##*/}.tar.gz" \
 		--exclude=\*.tar .
-	: ')))))))))) t-save-artifacts ))))))))))'
 }
 
 t-rm-dput-dropping () {
@@ -672,6 +675,12 @@ t-push-was-source-only () {
         done
 }
 
+t-push-included () {
+    for f in $@; do
+        stat $tmp/incoming/$f
+    done
+}
+
 t-pushed-good () {
 	local branch=$1
 	local suite=${2:-sid}
@@ -1131,6 +1140,16 @@ t-policy-periodic () {
 	: '))))))))))))))))))))))))))))))))))))))))'
 }
 
+t-buildproductsdir-config () {
+	bpd=$tmp/bpd
+	t-git-config dgit.default.build-products-dir $bpd
+	mkdir -p $bpd
+	cat <<END >>$tmp/.gbp.conf
+[buildpackage]
+export-dir = $bpd
+END
+}
+
 t-restrict () {
 	local restriction=$1
 	(cd $root; t-restriction-$restriction >&2)