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>
This commit is contained in:
Johannes Sixt 2016-11-03 21:12:13 +01:00 committed by Jeff King
parent 0f71fa273f
commit 038212c4c4

View File

@ -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"
}