diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2020-09-17 19:54:14 -0700 |
|---|---|---|
| committer | Jim Meyering <meyering@fb.com> | 2020-09-18 06:57:03 -0700 |
| commit | b9f39439106cc4d6665693751ce76f41643c0f82 (patch) | |
| tree | 4f4de214ea5f1d09dfc1cb89035679b7114008a9 /tests/in-eq-out-infloop | |
| parent | 0e862a91cc121febdeeba0afc440390d2a3cce02 (diff) | |
| download | grep-b9f39439106cc4d6665693751ce76f41643c0f82.tar.gz | |
grep: be more consistent about diagnostic format
* NEWS: Mention this.
* bootstrap.conf (gnulib_modules): Remove 'quote'.
* src/grep.c: Do not include quote.h.
(grep, grepdirent, grepdesc): Put the three unusual diagnostics
into the same "grep: FOO: message" form that grep uses elsewhere.
* tests/binary-file-matches, tests/in-eq-out-infloop:
Adjust tests to match new diagnostic format.
Diffstat (limited to 'tests/in-eq-out-infloop')
| -rwxr-xr-x | tests/in-eq-out-infloop | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/in-eq-out-infloop b/tests/in-eq-out-infloop index c6d59687..11ba9040 100755 --- a/tests/in-eq-out-infloop +++ b/tests/in-eq-out-infloop @@ -17,13 +17,13 @@ echo "$v" > out || framework_failure_ for arg in out - ''; do # Accommodate both 'out' and '(standard input)', as well as # the multi-byte quoting we see on OS/X-based systems. - echo grep: input file ... is also the output > err.exp || framework_failure_ + echo grep: ...: input file is also the output > err.exp || framework_failure_ # Require an exit status of 2. # grep-2.8 and earlier would infloop with $arg = out. # grep-2.10 and earlier would infloop with $arg = - or $arg = ''. timeout 10 grep 0 $arg < out >> out 2> err; st=$?; test $st = 2 || fail=1 - sed 's/file .* is/file ... is/' err > k && mv k err + sed 's/grep: .*: /grep: ...: /' err > k && mv k err # Normalize the diagnostic prefix from e.g., "/mnt/dir/grep: " to "grep: " sed 's/^[^:]*: /grep: /' err > k && mv k err compare err.exp err || fail=1 |