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

diff --git a/tests/lib b/tests/lib
index 04d1f2dc..6028133a 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
 }
 
@@ -38,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
@@ -62,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
@@ -71,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}
@@ -409,9 +416,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
 }
@@ -659,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}
@@ -686,6 +708,12 @@ t-pushed-good-core () {
 	git verify-tag `t-v-tag`
 }
 
+t-pushed-good-check-changes () {
+	changes_filename="$tmp/incoming/${p}_${v}_*.changes"
+        grep -E "^Distribution: $suite" $changes_filename
+        grep -E "^Version: $v" $changes_filename
+}
+
 t-splitbrain-pushed-good--unpack () {
 	cd $tmp
 	rm -rf t-unpack
@@ -1009,7 +1037,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 () {
@@ -1118,6 +1146,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)