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

diff --git a/tests/lib b/tests/lib
index 6533a90b..40f1f099 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
 }
 
@@ -41,6 +43,7 @@ export DGIT_TEST_TROOT=$troot
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
+	export DGIT_TEST_BYHAND=1
 	mkdir -p tests/tmp
 	tmpbase=$troot/tmp
 	tmp=tests/tmp/$testname
@@ -152,7 +155,7 @@ t-reporefs () {
 	 exec >"$outputfile"
 	 if test -d $whichrepo; then
 		cd $whichrepo
-		git show-ref |sort
+		git show-ref |t-sort
 	fi)
 }
 
@@ -408,9 +411,20 @@ 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
+	: '(((((((((( t-save-artifacts ))))))))))'
+	GZIP=-1v tar -C "$tmp" -zc -f "$artifacts/${0##*/}.tar.gz" \
+		--exclude=\*.tar .
+	: ')))))))))) t-save-artifacts ))))))))))'
+}
+
 t-rm-dput-dropping () {
 	rm -f $tmp/${p}_${v}_*.upload
 }
@@ -422,6 +436,7 @@ t-dgit () {
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
  ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \
+ ${DGIT_GITDEBREBASE_TEST+--git-debrebase=}${DGIT_GITDEBREBASE_TEST} \
 		${distro+${distro:+-d}}${distro--dtest-dummy} \
 		$DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
 		-kBCD22CD83243B79D3DFAC33EA3DBCBC039B13D8A $t_dgit_xopts "$@"
@@ -479,12 +494,12 @@ t-setup-done () {
 	local savedirs=$2
 	local importeval=$3
 
-	local import=IMPORT.${0##*/}
+	local import=IMPORT.${DGIT_TEST_TESTNAME-${0##*/}}
 	exec 4>$tmp/$import.new
 
 	local vn
 	for vn in $savevars; do
-		perl >&4 -I. -MDebian::Dgit -e '
+		perl >&4 -"I$root" -MDebian::Dgit -e '
 			printf "%s=%s\n", $ARGV[0], shellquote $ARGV[1]
 		' $vn "$(eval "printf '%s\n' \"\$$vn\"")"
 	done
@@ -1004,8 +1019,18 @@ t-commit () {
 	revision=$(( ${revision-0} + 1 ))
 }
 
+t-dch-r-rune () {
+	local cmd="$1"; shift
+	local suite=${1-unstable}
+	$cmd -r -D "$suite" ''
+}
+
+t-dch-commit-r () {
+	t-dch-r-rune t-dch-commit "$@"
+}
+
 t-dch-commit () {
-	dch "$@"
+	faketime @"${GIT_AUTHOR_DATE% *}" dch "$@"
 	git commit -m "dch $*" debian/changelog
 }
 
@@ -1133,7 +1158,11 @@ t-alt-test () {
 
 t-git-config dgit.default.old-dsc-distro test-dummy
 
-case "$0" in
-*/gnupg) ;;
-*)	t-setup-import gnupg	;;
-esac
+for import in ${autoimport-gnupg}; do
+	case "$0" in
+	*/$import) ;;
+	*)
+		t-setup-import $import
+		;;
+	esac
+done