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 e58da5147ae4b7c9e7353dc2e8efa07a9d27c232..2649a313490d22a1aa941c262e0a68742c983576 100755 (executable)
--- a/tests/tests/manpages-format
+++ b/tests/tests/manpages-format
@@ -3,7 +3,7 @@ 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
 
@@ -22,14 +22,18 @@ run_man () {
        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 () {