X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fmanpages-format;h=7ba2f9df3f1ae11703d9564991b0108d5dd4187a;hb=fc36b5b71a33e555d92d368beffeb2735fbe0010;hp=79eda7529dbc519df7d77f7c1d031b84b1497576;hpb=9f89aa601dc0ca0ea4387ce3cd9e1304770577e3;p=dgit.git

diff --git a/tests/tests/manpages-format b/tests/tests/manpages-format
index 79eda752..7ba2f9df 100755
--- a/tests/tests/manpages-format
+++ b/tests/tests/manpages-format
@@ -7,7 +7,7 @@ t-dependencies man-db make groff git-debrebase
 
 cd $root
 
-printenv |grep MAKE ||: |sort
+printenv |grep MAKE ||: |t-sort
 manpages=$(MAKEFLAGS= MAKELEVEL= make list-manpages)
 
 export MANWIDTH=80
@@ -19,11 +19,11 @@ run_man () {
 		make $roff >&2
 		cmd='man "$@" -l $roff'
 	fi
-	eval "$cmd 2>&1 >/dev/null |tee $errs >&2"
+	eval "$cmd 2>&1 >/dev/null |tee $errs"
 }
 
 for roff in $manpages; do
-	for fmt in txt; do
+	for fmt in txt ps; do
 		>$tmp/$roff.$fmt-expected
 	done
 done
@@ -37,12 +37,14 @@ not_egrep_vxPf () {
 	perl -ne '
 		BEGIN () {
 			open PATS, shift @ARGV or die $!;
-			$re = join "|", map { chomp; qr{^(?:$_)$} } <PATS>;
+			$re = join "|", map { chomp; qr{^(?:$_)$} }
+				qr{^(?=a)b}, <PATS>;
+			print STDERR "RE $re\n";
 		}
 		next if m{$re};
 		print STDERR "unexpected: $_";
 		$bad = 1;
-		END { die "unexpected, re= $re\n" if $bad; }
+		END { die "unexpected errors\n" if $bad; }
 	' "$@"
 }
 
@@ -65,7 +67,11 @@ for roff in $manpages; do
 	page=${roff%.*}
 
 	prep txt
-	run_man >/dev/null
+	run_man
+	check
+
+	prep ps
+	run_man -Tps
 	check
 done