summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--THANKS.in1
-rwxr-xr-xtests/misc/sort-debug-keys11
2 files changed, 9 insertions, 3 deletions
diff --git a/THANKS.in b/THANKS.in
index a7ec93308..011d2b976 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -525,6 +525,7 @@ Solar Designer solar@owl.openwall.com
Stanislav Ievlev inger@altlinux.ru
Stavros Passas stabat@ics.forth.gr
Stefan Vargyas stvar@yahoo.com
+Stefano Lattarini stefano.lattarini@gmail.com
Stéphane Chazelas Stephane_CHAZELAS@yahoo.fr
Stephen Depooter sbdep@myrealbox.com
Stephen Eglen eglen@pcg.wustl.edu
diff --git a/tests/misc/sort-debug-keys b/tests/misc/sort-debug-keys
index 238c33e23..b4c2fb74e 100755
--- a/tests/misc/sort-debug-keys
+++ b/tests/misc/sort-debug-keys
@@ -308,16 +308,21 @@ _____
___________________
EOF
+unset LC_ALL
+f=$LOCALE_FR_UTF8
+
: ${LOCALE_FR_UTF8=none}
if test "$LOCALE_FR_UTF8" != "none"; then
(
echo ' 1²---++3 1,234 Mi' |
LC_ALL=C sort --debug -k2g -k1b,1
echo ' 1²---++3 1,234 Mi' |
- LC_ALL=$LOCALE_FR_UTF8 sort --debug -k2g -k1b,1
+ LC_COLLATE=$f LC_CTYPE=$f LC_NUMERIC=$f LC_MESSAGES=C \
+ sort --debug -k2g -k1b,1
echo '+1234 1234Gi 1,234M' |
- LC_ALL=$LOCALE_FR_UTF8 sort --debug -k1,1n -k1,1g \
- -k1,1h -k2,2n -k2,2g -k2,2h -k3,3n -k3,3g -k3,3h
+ LC_COLLATE=$f LC_CTYPE=$f LC_NUMERIC=$f LC_MESSAGES=C \
+ sort --debug -k1,1n -k1,1g \
+ -k1,1h -k2,2n -k2,2g -k2,2h -k3,3n -k3,3g -k3,3h
) > out
compare out exp || fail=1
fi