X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=a297227fc73c6c6376927eb6db5f09b13e34b29a;hp=04d1f2dc1019fbb60c67772d5a70edf2f4327030;hb=42d2e3ec03b634c5719700c5bcfb27f0f652d74c;hpb=a47f1af332372a372bf5758d1e3d9eeffe14acbd

diff --git a/tests/lib b/tests/lib
index 04d1f2dc..a297227f 100644
--- a/tests/lib
+++ b/tests/lib
@@ -17,6 +17,8 @@ funcs: ${FUNCNAME[*]}
 lines: ${BASH_LINENO[*]}
 files: ${BASH_SOURCE[*]}
 END
+	t-save-artifacts
+
 	exit 16
 }
 
@@ -62,6 +64,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
@@ -71,6 +74,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}
@@ -409,9 +415,18 @@ t-fscks () {
 t-ok () {
 	: '========================================'
 	t-fscks
+	t-save-artifacts
 	echo ok.
 }
 
+t-save-artifacts () {
+	artifacts="$AUTOPKGTEST_ARTIFACTS"
+	if [ x"$artifacts" = x ]; then return; fi
+	if [ x"tmp" = x ]; then return; fi
+	GZIP=-1v tar -C "$tmp" -zc -f "$artifacts/${0##*/}.tar.gz" \
+		--exclude=\*.tar .
+}
+
 t-rm-dput-dropping () {
 	rm -f $tmp/${p}_${v}_*.upload
 }
@@ -1009,7 +1024,7 @@ t-commit () {
 t-dch-r-rune () {
 	local cmd="$1"; shift
 	local suite=${1-unstable}
-	$cmd -r sid
+	$cmd -r -D "$suite" ''
 }
 
 t-dch-commit-r () {