X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Flib;h=fa8d6bb58e0847a57bd9bf2bebddb7332fcdd370;hb=edbc2fc23a2df787cc7c0d998df9724dcaceaaf7;hp=3c04155a2ddbe398ba480030186b1ab8add23186;hpb=4d5ef701bf95a1c60a5cc1b9f5c4d771ac49375a;p=dgit.git

diff --git a/tests/lib b/tests/lib
index 3c04155a..fa8d6bb5 100644
--- a/tests/lib
+++ b/tests/lib
@@ -37,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
@@ -389,7 +390,7 @@ t-fscks () {
 	(
 	shopt -s nullglob
 	for d in $tmp/*/.git $tmp/git/*.git; do
-		cd "$d"
+		cd "${d%/.git}"
 		t-git-fsck
 	done
 	)
@@ -407,7 +408,7 @@ t-rm-dput-dropping () {
 
 t-dgit () {
 	local dgit=${DGIT_TEST-dgit}
-	pwd
+	pwd >&2
 	: '
 {{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{{'
 	$dgit --dgit=$dgit --dget:-u --dput:--config=$tmp/dput.cf \
@@ -419,6 +420,17 @@ t-dgit () {
 '
 }
 
+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 $*
 }
@@ -973,7 +985,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