X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=564ea512a6b0fd61a913d39618e3fe97e5cd7d84;hp=87dd37617e7f6769a8eb42657e745ecf7af9b177;hb=3a3ec0b3ff3408922f4740d83fa291d6d30adf45;hpb=45fad9bad87765ce13511a0ba8f302ba9ddd1cd5

diff --git a/tests/lib b/tests/lib
index 87dd3761..564ea512 100644
--- a/tests/lib
+++ b/tests/lib
@@ -64,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
@@ -73,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}
@@ -419,21 +423,8 @@ t-save-artifacts () {
 	artifacts="$AUTOPKGTEST_ARTIFACTS"
 	if [ x"$artifacts" = x ]; then return; fi
 	if [ x"tmp" = x ]; then return; fi
-	: '(((((((((( t-save-artifacts ))))))))))'
-	cp -a "$tmp"/. "$artifacts"/.
-	cd "$artifacts"/.
-	find . \( -name \*.tar -o -name \*.sample \) -print0 | \
-		xargs -0r rm -v
-	find . \( -name .git \
-		-o -path ./salsa/\* \
-		-o -path ./git/\*.git \
-		\) -type d \
-		\! -path '*/.git/*/.git' -exec sh -xec '
-			cd "$1"
-			"$2"/playtree-save-refs
-			git gc --prune=all
-		' x '{}' "$troot" \;
-	: ')))))))))) t-save-artifacts ))))))))))'
+	GZIP=-1v tar -C "$tmp" -zc -f "$artifacts/${0##*/}.tar.gz" \
+		--exclude=\*.tar .
 }
 
 t-rm-dput-dropping () {
@@ -1142,6 +1133,11 @@ t-policy-periodic () {
 	: '))))))))))))))))))))))))))))))))))))))))'
 }
 
+t-buildproductsdir-config () {
+	t-git-config dgit.default.build-products-dir $tmp/bpd
+	mkdir -p $tmp/bpd
+}
+
 t-restrict () {
 	local restriction=$1
 	(cd $root; t-restriction-$restriction >&2)