diff options
| author |  Johannes Sixt <j6t@kdbg.org> | 2016-11-03 21:12:13 +0100 |
|---|---|---|
| committer |  Jeff King <peff@peff.net> | 2016-11-08 15:26:40 -0500 |
| commit | 038212c4c40c4cd9eb518fb1fbb5eb0d0d7d8f67 (patch) | |
| tree | f733b3d9a7dbc0a4d91153742d1048d117981462 /t | |
| parent | contrib/long-running-filter: add long running filter example (diff) | |
| download | tgif-038212c4c40c4cd9eb518fb1fbb5eb0d0d7d8f67.tar.xz | |
t0021: expect more variations in the output of uniq -c
Some versions of uniq -c write the count left-justified, other version
write it right-justified. Be prepared for both kinds.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Jeff King <peff@peff.net>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t0021-conversion.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/t/t0021-conversion.sh b/t/t0021-conversion.sh index a20b9f58e3..db71acacb3 100755 --- a/t/t0021-conversion.sh +++ b/t/t0021-conversion.sh @@ -40,10 +40,9 @@ test_cmp_count () { actual=$2 for FILE in "$expect" "$actual" do - sort "$FILE" | uniq -c | sed "s/^[ ]*//" | - sed "s/^\([0-9]\) IN: clean/x IN: clean/" | - sed "s/^\([0-9]\) IN: smudge/x IN: smudge/" >"$FILE.tmp" && - mv "$FILE.tmp" "$FILE" + sort "$FILE" | uniq -c | + sed -e "s/^ *[0-9][0-9]*[ ]*IN: /x IN: /" >"$FILE.tmp" && + mv "$FILE.tmp" "$FILE" || return done && test_cmp "$expect" "$actual" } |