X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib;h=fcc2a69766e73b34a32b8ba0cdd1112893c1775f;hp=7023dbfab7ce5e45a9a2175a4de7d4e0c567612b;hb=54b427747f1491776db2cba723645dd437c3e606;hpb=abbe9041dc53bc874ec845f1c7353d43a864b560

diff --git a/tests/lib b/tests/lib
index 7023dbfa..fcc2a697 100644
--- a/tests/lib
+++ b/tests/lib
@@ -12,6 +12,7 @@ t-report-failure () {
 	rc=$1
 	cat <<END >&2
 TEST FAILED
+cwd: $PWD
 funcs: ${FUNCNAME[*]}
 lines: ${BASH_LINENO[*]}
 files: ${BASH_SOURCE[*]}
@@ -36,6 +37,7 @@ export GIT_AUTHOR_DATE='1440253867 +0100'
 root=`pwd`
 troot=$root/tests
 testname="${DGIT_TEST_TESTNAME-${0##*/}}"
+export DGIT_TEST_TROOT=$troot
 
 tmp=$ADTTMP
 if [ x"$tmp" = x ]; then
@@ -358,9 +360,11 @@ t-expect-fsck-fail () {
 }
 
 t-git-fsck () {
+	local fsckerrs=$(git rev-parse --git-dir)/dgit-test-fsck.errs
+
 	set +e
 	LC_MESSAGES=C git fsck --no-dangling --strict 2>&1 \
-		| tee dgit-test-fsck.errs
+		| tee $fsckerrs
 	ps="${PIPESTATUS[*]}"
 	set -e
 
@@ -374,7 +378,7 @@ t-git-fsck () {
 	pats+=(-e 'notice: No default references')
 
 	set +e
-	grep -v "${pats[@]}" dgit-test-fsck.errs
+	grep -v "${pats[@]}" $fsckerrs
 	rc=$?
 	set -e
 	case $rc in
@@ -388,7 +392,7 @@ t-fscks () {
 	(
 	shopt -s nullglob
 	for d in $tmp/*/.git $tmp/git/*.git; do
-		cd "$d"
+		cd "${d%/.git}"
 		t-git-fsck
 	done
 	)
@@ -406,18 +410,29 @@ t-rm-dput-dropping () {
 
 t-dgit () {
 	local dgit=${DGIT_TEST-dgit}
-	pwd
+	pwd >&2
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
  ${dgit_config_debian_alias-"--config-lookup-explode=dgit-distro.debian.alias-canon"} \
-		${distro--dtest-dummy} ${distro+${distro:+-d}${distro}} \
+		${distro+${distro:+-d}}${distro--dtest-dummy} \
 		$DGIT_TEST_OPTS $DGIT_TEST_DEBUG \
 		-k39B13D8A $t_dgit_xopts "$@"
 	: '}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}}
 '
 }
 
+t-dgit-manpage () {
+	local section=$1
+	local page=$2
+	(export LC_ALL=C.UTF-8
+	 if [ "$DGIT_TEST_INTREE" ]; then
+		make -C $DGIT_TEST_INTREE $page.$section.view
+	 else
+		man $section $page
+	 fi)
+}
+
 t-diff-nogit () {
 	diff --exclude=.git --exclude=.pc -ruN $*
 }
@@ -783,6 +798,7 @@ t-822-field () {
 
 t-defdistro () {
 	export DGIT_TEST_DISTRO=''
+	distro=''
 	t-git-config dgit-suite.unstable.distro test-dummy
 }
 
@@ -971,7 +987,6 @@ t-git-config () {
 }
 
 t-drs () {
-	export DGIT_TEST_TROOT=$troot
  t-git-config dgit-distro.test-dummy.git-url "ext::$troot/drs-git-ext %S "
  t-git-config dgit-distro.test-dummy.git-check true
  t-git-config dgit-distro.test-dummy.git-create true
@@ -1024,7 +1039,9 @@ t-dsd () {
 }
 
 t-policy-admin () {
+	: '(((((((((((((((((((((((((((((((((((((((('
 	${DGIT_INFRA_PFX}dgit-repos-admin-debian --repos $tmp/git "$@"
+	: '))))))))))))))))))))))))))))))))))))))))'
 }
 
 t-policy-nonexist () {
@@ -1056,8 +1073,10 @@ t-debpolicy () {
 }
 
 t-policy-periodic () {
+	: '(((((((((((((((((((((((((((((((((((((((('
 	${DGIT_REPOS_SERVER_TEST-dgit-repos-server} \
 		test-dummy $drs_dispatch '' --cron
+	: '))))))))))))))))))))))))))))))))))))))))'
 }
 
 t-restrict () {
@@ -1085,6 +1104,8 @@ t-alt-test () {
 	t-chain-test "${t#*-}"
 }
 
+t-git-config dgit.default.old-dsc-distro test-dummy
+
 case "$0" in
 */gnupg) ;;
 *)	t-setup-import gnupg	;;