test suite: manpages-format: Remove some pointless redirects

[dgit.git] / tests / tests / manpages-format

diff --git a/tests/tests/manpages-format b/tests/tests/manpages-format
index 4b9585f2618990edb4a0596da65af1a3f5224ef4..c905445ba033f24862c3101ce9f98cfba9160ea7 100755 (executable)
--- a/tests/tests/manpages-format
+++ b/tests/tests/manpages-format
@@ -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; do
+               >$tmp/$roff.$fmt-expected
+       done
 done
 
 expected () {
-       cat >$tmp/$1.expected
+       cat >$tmp/$2.$1-expected
 }
 
 not_egrep_vxPf () {
@@ -44,18 +46,27 @@ not_egrep_vxPf () {
        ' "$@"
 }
 
-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
 done
 
 t-ok