test suite: Always pass LC_COLLATE=C to sort(1).

Specifically, by replacing every invocation of sort with the new
function t-sort.  The one case where we already took care of this, we
change LC_ALL to LC_COLLATE, which should be sufficient.

Closes:#903006.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

3 files changed, 3 insertions, 3 deletions

diff --git a/tests/tests/checkout b/tests/tests/checkout
index 4b205f3..bc3d6ef 100755
--- a/tests/tests/checkout
+++ b/tests/tests/checkout
@@ -39,7 +39,7 @@ dgit checkout unstable
 END
 diff -u ../reflog.{expect,got}
 
-git for-each-ref --format='%(refname)' refs/heads | sort >../refs.got
+git for-each-ref --format='%(refname)' refs/heads | t-sort >../refs.got
 cat >../refs.expect <<END
 refs/heads/dgit/sid
 refs/heads/dgit/stable
diff --git a/tests/tests/import-native b/tests/tests/import-native
index 1e09343..0766841 100755
--- a/tests/tests/import-native
+++ b/tests/tests/import-native
@@ -8,7 +8,7 @@ t-tstunt-parsechangelog
 mkdir $tmp/aside
 
 versions=""
-for f in $(find $tmp/mirror -name \*.dsc | sort); do
+for f in $(find $tmp/mirror -name \*.dsc | t-sort); do
 	perl -i -pe '
 		$_="" if m/^-----BEGIN PGP SIGNED/..!m/\S/;
 		$_="" if m/^-----BEGIN PGP SIGNATURE/..0;
diff --git a/tests/tests/manpages-format b/tests/tests/manpages-format
index 3f3362b..7ba2f9d 100755
--- a/tests/tests/manpages-format
+++ b/tests/tests/manpages-format
@@ -7,7 +7,7 @@ t-dependencies man-db make groff git-debrebase
 
 cd $root
 
-printenv |grep MAKE ||: |sort
+printenv |grep MAKE ||: |t-sort
 manpages=$(MAKEFLAGS= MAKELEVEL= make list-manpages)
 
 export MANWIDTH=80