test suite: manpages-format: Cope with buster & eatmydata

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

diff --git a/tests/tests/manpages-format b/tests/tests/manpages-format
index 3f3362b6ea8e3dd429593b3ca0596a02f0a482d8..2649a313490d22a1aa941c262e0a68742c983576 100755 (executable)
--- a/tests/tests/manpages-format
+++ b/tests/tests/manpages-format
@@ -3,33 +3,37 @@ set -e
 autoimport=
 . tests/lib
 
-t-dependencies man-db make groff git-debrebase
+t-dependencies man-db make groff git-debrebase git-debpush
 
 cd $root
 
-printenv |grep MAKE ||: |sort
+printenv |grep MAKE ||: |t-sort
 manpages=$(MAKEFLAGS= MAKELEVEL= make list-manpages)
 
 export MANWIDTH=80
 
 run_man () {
        if [ "x${DGIT_MANPAGES_SOURCE_DIR}" = x ]; then
-               cmd='man "$@" $section $page'
+               cmd='man --warnings "$@" $section $page'
        else
                make $roff >&2
-               cmd='man "$@" -l $roff'
+               cmd='man --warnings "$@" -l $roff'
        fi
        eval "$cmd 2>&1 >/dev/null |tee $errs"
 }
 
+cat >$tmp/always-expected <<'END'
+ERROR.*
+END
+
 for roff in $manpages; do
        for fmt in txt ps; do
-               >$tmp/$roff.$fmt-expected
+               cat $tmp/always-expected >$tmp/$roff.$fmt-expected
        done
 done
 
 expected () {
-       cat >$tmp/$2.$1-expected
+       cat >>$tmp/$2.$1-expected
 }
 
 not_egrep_vxPf () {