diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2021-08-31 02:09:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2021-08-31 02:11:04 -0700 |
| commit | b24303a2c54cf85c878fe49df413717180d902e3 (patch) | |
| tree | 6a0c5bb6bbcbe2393183e794dfcbf5165b763be1 | |
| parent | 6c8ef2ae8e8f0ce22b6b8f4b163959a3b5ef06f2 (diff) | |
| download | gzip-b24303a2c54cf85c878fe49df413717180d902e3.tar.gz | |
tests: port better to NetBSD
* tests/hufts, tests/zdiff:
Ignore lines starting with ‘+’ in stderr.
The NetBSD shell outputs them after set -x.
| -rwxr-xr-x | tests/hufts | 9 | ||||
| -rwxr-xr-x | tests/zdiff | 3 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/hufts b/tests/hufts index ec84540..8152091 100755 --- a/tests/hufts +++ b/tests/hufts @@ -23,12 +23,15 @@ printf '\n...: invalid compressed data--format violated\n' > exp \ || framework_failure_ fail=0 -returns_ 1 gzip -dc "$abs_srcdir/hufts-segv.gz" > out 2> err || fail=1 +returns_ 1 gzip -dc "$abs_srcdir/hufts-segv.gz" > out 2> err-hufts || fail=1 compare /dev/null out || fail=1 -sed 's/.*hufts-segv.gz: /...: /' err > k; mv k err || fail=1 -grep -v 'Operation-Ending-Supplemental Code' err > k; mv k err || fail=1 +sed ' + s/.*hufts-segv.gz: /...: / + /^+/d + /Operation-Ending-Supplemental Code/d +' err-hufts > err || framework_failure_ compare exp err || fail=1 printf '\037\213\010\000\060\060\060\060\060\060\144\000\000\000' > bug33501 \ diff --git a/tests/zdiff b/tests/zdiff index da72fc7..151274c 100755 --- a/tests/zdiff +++ b/tests/zdiff @@ -34,9 +34,10 @@ diff a b | diff exp - || skip_ "diff output format is incompatible with POSIX" fail=0 gzip a b || fail=1 -returns_ 1 zdiff a.gz b.gz > out 2>&1 || fail=1 +returns_ 1 zdiff a.gz b.gz > out 2> err || fail=1 compare exp out || fail=1 +grep -v '^+' err && fail=1 rm -f out # expect success, for equal files |