From 04148c99c514d9adea1e3cd831d5451f957f1074 Mon Sep 17 00:00:00 2001
From: =?utf8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
Date: Sat, 11 Mar 2017 10:44:46 -0800
Subject: [PATCH] tests: avoid a false failure on OS X 10.5.8

* tests/misc/sort-debug-keys.sh: Disparate LC_CTYPE and LC_MESSAGES
are not supported, with the result LC_MESSAGES=C is used throughout.
Therefore just set LC_ALL in the test, and normalize the message
variants with sed.
Reported and tested by J Rogowsky.
---
 tests/misc/sort-debug-keys.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/misc/sort-debug-keys.sh b/tests/misc/sort-debug-keys.sh
index f90aa0f2d4..cb03a1f1c2 100755
--- a/tests/misc/sort-debug-keys.sh
+++ b/tests/misc/sort-debug-keys.sh
@@ -324,13 +324,13 @@ 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_COLLATE=$f LC_CTYPE=$f LC_NUMERIC=$f LC_MESSAGES=C \
-        sort --debug -k2g -k1b,1
+    LC_ALL=$f sort --debug -k2g -k1b,1
   echo '+1234 1234Gi 1,234M' |
-    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
+    LC_ALL=$f sort --debug \
+        -k1,1n -k1,1g -k1,1h \
+        -k2,2n -k2,2g -k2,2h \
+        -k3,3n -k3,3g -k3,3h
+  ) | sed 's/^^ .*/^ no match for key/' > out
   compare exp out || fail=1
 fi
 
-- 
2.47.2