X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=dgit.git;a=blobdiff_plain;f=tests%2Flib-import-chk;h=d6633f96316057f9f2fe96792e493ff850ea91e0;hp=a456b014bdf4da831cb206c952e4e53200049d62;hb=244a7da76c07975d807da32de824ab3e3ee55478;hpb=8c0703a043f1deedc4dee9500d8f7da8b382543a

diff --git a/tests/lib-import-chk b/tests/lib-import-chk
index a456b014..d6633f96 100644
--- a/tests/lib-import-chk
+++ b/tests/lib-import-chk
@@ -1,10 +1,11 @@
 
 t-import-chk-authorship () {
 	perl -ne 'print $1,"\n" if m/^ -- (\S.*\>)  /' debian/changelog \
-		| sort -u \
+		| t-sort -u \
 		> $tmp/authorship.changelog
+	${import_chk_changelog_massage:-:} $tmp/authorship.changelog
 	git log --pretty=format:'%an <%ae>%n%cn <%ce>' \
-		| sort -u \
+		| t-sort -u \
 		> $tmp/authorship.commits
 	diff $tmp/authorship.{changelog,commits}
 }
@@ -62,7 +63,7 @@ t-import-chk2() {
 	t-ref-same refs/heads/first-2nd-import
 
 	for orig in ../${p}_${v%-*}.orig*.tar.*; do
-		tar -atf $orig | LC_ALL=C sort >../files.o
+		tar -atf $orig | t-sort >../files.o
 		pfx=$(perl <../files.o -ne '
 			while (<>) {
 				m#^([^/]+/)# or exit 0;
@@ -86,7 +87,7 @@ t-import-chk2() {
 			t-ref-same-val "$orig $start" "$imp"
 		done
 		git ls-tree -r --name-only "$t_ref_val:" \
-			| sort >../files.g
+			| t-sort >../files.g
 		diff ../files.{o,g}
 	done
 	cd ..