From 1ce7c505610add988b492d32a68ef8b8231327f6 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Fri, 9 Apr 2010 20:53:49 +0200 Subject: [PATCH] init.sh: run tr in the "C" locale to avoid multibyte interpretation * tests/init.sh (rand_bytes_): Run tr in the "C" locale so it does not try to interpret its random input bytes. Jarno Rajahalme reported that ./test-xalloc-die.sh would fail with "tr: Illegal byte sequence" on Darwin 10.3.0 with LC_CTYPE=UTF-8. (mktempd_): Likewise, just in case. (cherry picked from commit 6b8b58b99d6aaedeed12300cc154af7d3af7b95f) --- ChangeLog | 7 +++++++ tests/init.sh | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e6747aaea..6c5122db1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2010-04-09 Jim Meyering + init.sh: run tr in the "C" locale to avoid multibyte interpretation + * tests/init.sh (rand_bytes_): Run tr in the "C" locale so it does + not try to interpret its random input bytes. Jarno Rajahalme reported + that ./test-xalloc-die.sh would fail with "tr: Illegal byte sequence". + on Darwin 10.3.0 with LC_CTYPE=UTF-8. + (mktempd_): Likewise, just in case. + ftruncate: add two years to projected module removal date: 2012 * m4/ftruncate.m4: Adjust comments. diff --git a/tests/init.sh b/tests/init.sh index abfa3b3c3..ee9c542c6 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -259,7 +259,7 @@ rand_bytes_() if test -r "$dev_rand_"; then # Note: 256-length($chars_) == 194; 3 copies of $chars_ is 186 + 8 = 194. dd ibs=$n_ count=1 if=$dev_rand_ 2>/dev/null \ - | tr -c $chars_ 01234567$chars_$chars_$chars_ + | LC_ALL=C tr -c $chars_ 01234567$chars_$chars_$chars_ return fi @@ -276,7 +276,7 @@ rand_bytes_() echo "$data_" \ | dd bs=1 skip=50 count=$n_ 2>/dev/null \ - | tr -c $chars_ 01234567$chars_$chars_$chars_ + | LC_ALL=C tr -c $chars_ 01234567$chars_$chars_$chars_ } mktempd_() -- 2.11.0