From 7d452149484872da4853e251eb488db28b1bca49 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 13 Sep 2026 11:06:10 -0700 Subject: [PATCH] tests: fix subst-mb-incomplete test on NetBSD * testsuite/subst-mb-incomplete.sh: Use en_US.UTF-8, not en_US.utf8, as the latter does not work in NetBSD and require_en_utf8_locale_ tests for the former. * cfg.mk (sc_THANKS_in_sorted): Do so here, too, for completeness. --- cfg.mk | 4 ++-- testsuite/subst-mb-incomplete.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg.mk b/cfg.mk index e8c2aa6..fd0aafe 100644 --- a/cfg.mk +++ b/cfg.mk @@ -142,10 +142,10 @@ sc_THANKS_in_duplicates: 1>&2; exit 1; } || : # Ensure the contributor list stays sorted. However, if the system's -# en_US.utf8 locale data is erroneous, give a diagnostic and skip +# en_US.UTF-8 locale data is erroneous, give a diagnostic and skip # this test. This affects Ubuntu up to at least 22.04. sc_THANKS_in_sorted: - @printf '%s\n' J.T. Jakub | LC_ALL=en_US.utf8 sort -fc 2>/dev/null \ + @printf '%s\n' J.T. Jakub | LC_ALL=en_US.UTF-8 sort -fc 2>/dev/null \ && { \ sed '/^$$/,/^$$/!d;/^$$/d' $(srcdir)/THANKS.in > $@.1 && \ LC_ALL=en_US.UTF-8 sort -f -k1,1 $@.1 > $@.2 && \ diff --git a/testsuite/subst-mb-incomplete.sh b/testsuite/subst-mb-incomplete.sh index 427855d..0603768 100755 --- a/testsuite/subst-mb-incomplete.sh +++ b/testsuite/subst-mb-incomplete.sh @@ -25,7 +25,7 @@ require_en_utf8_locale_ echo > in || framework_failure_ printf '\233\375\200\n' > exp-out || framework_failure_ -LC_ALL=en_US.utf8 sed $(printf 's/^/\\L\233\375\\\200/') in > out 2> err +LC_ALL=en_US.UTF-8 sed $(printf 's/^/\\L\233\375\\\200/') in > out 2> err compare exp-out out || fail=1 compare /dev/null err || fail=1