diff options
author | Pádraig Brady <P@draigBrady.com> | 2019-03-06 10:34:16 -0800 |
---|---|---|
committer | Pádraig Brady <P@draigBrady.com> | 2019-03-06 10:52:17 -0800 |
commit | 16358bc19c34d9941fba6c183699c07d810423a3 (patch) | |
tree | 42d2fc5cf427240f3f094104a1c140538b77c049 | |
parent | 4bbbe49074c996e90e19903dddd858ff8a2bf648 (diff) | |
download | coreutils-16358bc19c34d9941fba6c183699c07d810423a3.tar.gz |
tests: wc-nbsp.sh: avoid failure on FreeBSD
* tests/misc/wc-nbsp.sh: FreeBSD and OS X don't
treat non breaking space as printable characters.
So use wc -L to determine printability before
testing non breaking space functionality.
-rwxr-xr-x | tests/misc/wc-nbsp.sh | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/tests/misc/wc-nbsp.sh b/tests/misc/wc-nbsp.sh index 11ee0d655..aca971cd8 100755 --- a/tests/misc/wc-nbsp.sh +++ b/tests/misc/wc-nbsp.sh @@ -24,19 +24,27 @@ print_ver_ wc printf export LC_ALL=en_US.ISO-8859-1 if test "$(locale charmap 2>/dev/null)" = ISO-8859-1; then - test $(env printf '=\xA0=' | wc -w) = 2 || fail=1 - test $(env printf '=\xA0=' | POSIXLY_CORRECT=1 wc -w) = 1 || fail=1 + # Use -L to determine whether NBSP is printable. + # FreeBSD 11 and OS X treat NBSP as non printable ? + if test "$(env printf '=\xA0=' | wc -L)" = 3; then + test $(env printf '=\xA0=' | wc -w) = 2 || fail=1 + test $(env printf '=\xA0=' | POSIXLY_CORRECT=1 wc -w) = 1 || fail=1 + fi fi export LC_ALL=en_US.UTF-8 if test "$(locale charmap 2>/dev/null)" = UTF-8; then - test $(env printf '=\u00A0=' | wc -w) = 2 || fail=1 - test $(env printf '=\u2007=' | wc -w) = 2 || fail=1 - test $(env printf '=\u202F=' | wc -w) = 2 || fail=1 - test $(env printf '=\u2060=' | wc -w) = 2 || fail=1 + if test "$(env printf '=\u00A0=' | wc -L)" = 3; then + test $(env printf '=\u00A0=' | wc -w) = 2 || fail=1 + test $(env printf '=\u2007=' | wc -w) = 2 || fail=1 + test $(env printf '=\u202F=' | wc -w) = 2 || fail=1 + test $(env printf '=\u2060=' | wc -w) = 2 || fail=1 + fi fi export LC_ALL=ru_RU.KOI8-R if test "$(locale charmap 2>/dev/null)" = KOI8-R; then - test $(env printf '=\x9A=' | wc -w) = 2 || fail=1 + if test "$(env printf '=\x9A=' | wc -L)" = 3; then + test $(env printf '=\x9A=' | wc -w) = 2 || fail=1 + fi fi Exit $fail |