X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=tests%2Ftests%2Fmanpages-format;h=7ba2f9df3f1ae11703d9564991b0108d5dd4187a;hb=e032c0f964491a71e8918b79ad2a774993074085;hp=4b9585f2618990edb4a0596da65af1a3f5224ef4;hpb=1066c6442bc1471d440ac86711250d825b5ddc2c;p=dgit.git

diff --git a/tests/tests/manpages-format b/tests/tests/manpages-format
index 4b9585f2..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,15 +19,17 @@ 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
-	>$tmp/$roff.expected
+	for fmt in txt ps; do
+		>$tmp/$roff.$fmt-expected
+	done
 done
 
 expected () {
-	cat >$tmp/$1.expected
+	cat >$tmp/$2.$1-expected
 }
 
 not_egrep_vxPf () {
@@ -35,27 +37,42 @@ 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; }
 	' "$@"
 }
 
-expected dgit.1 <<'END'
+expected txt dgit.1 <<'END'
 .* # table wider than line width
 END
 
+prep () {
+	fmt=$1
+	errs=$tmp/$roff.$fmt-errs
+}
+
+check () {
+	perl -0777 -i~ -pe 's/\n[ \t]+/ # /' $errs
+	not_egrep_vxPf $tmp/$roff.$fmt-expected $errs
+}
+
 for roff in $manpages; do
 	section=${roff##*.}
 	page=${roff%.*}
 
-	errs=$tmp/$roff.errs
-	run_man >/dev/null
-	perl -0777 -i~ -pe 's/\n[ \t]+/ # /' $errs
-	not_egrep_vxPf $tmp/$roff.expected $errs
+	prep txt
+	run_man
+	check
+
+	prep ps
+	run_man -Tps
+	check
 done
 
 t-ok