From f04e0da045ba8f318e983ec13660cfd84f606c63 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 21 Apr 2026 08:26:13 -0700 Subject: [PATCH] tests: skip C-locale sub-tests when "C" is multibyte * testsuite/mb-bad-delim.sh: Don't run the sub-test that uses an incomplete multibyte byte as a single-byte delimiter in C locale. * testsuite/mb-y-translate.sh: Don't run the two sub-tests that expect a y/// length-mismatch error in C locale. Android's bionic libc uses UTF-8 even in the C locale, so these sub-tests would always fail. Reported by Bruno Haible in https://lists.gnu.org/r/sed-devel/2026-04/msg00019.html --- testsuite/mb-bad-delim.sh | 11 +++++++---- testsuite/mb-y-translate.sh | 18 ++++++++++++------ 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/testsuite/mb-bad-delim.sh b/testsuite/mb-bad-delim.sh index 6e205ee..a9f07e4 100755 --- a/testsuite/mb-bad-delim.sh +++ b/testsuite/mb-bad-delim.sh @@ -58,10 +58,13 @@ returns_ 1 env LC_ALL=en_US.UTF-8 sed -f prog2 err2 || fail=1 compare_ exp-err2 err2 || fail=1 # ... but accept octet \316 as delimiter in C locale -echo a > in2 || framework_failure_ -echo b > exp2 || framework_failure_ -LC_ALL=C sed -f prog2 out2 || fail=1 -compare_ exp2 out2 || fail=1 +# Skip if C locale is multibyte (e.g., Android bionic defaults to UTF-8). +if test "$(LC_ALL=C get-mb-cur-max C)" = 1; then + echo a > in2 || framework_failure_ + echo b > exp2 || framework_failure_ + LC_ALL=C sed -f prog2 out2 || fail=1 + compare_ exp2 out2 || fail=1 +fi diff --git a/testsuite/mb-y-translate.sh b/testsuite/mb-y-translate.sh index bde063d..e3e889b 100755 --- a/testsuite/mb-y-translate.sh +++ b/testsuite/mb-y-translate.sh @@ -49,11 +49,14 @@ LC_ALL=en_US.UTF-8 sed -f p1 out1 || fail=1 compare_ exp1 out1 || fail=1 # in C locale, report error of mismatched length -cat <<\EOF > exp-err1 || framework_failure_ +# Skip if C locale is multibyte (e.g., Android bionic defaults to UTF-8). +if test "$(LC_ALL=C get-mb-cur-max C)" = 1; then + cat <<\EOF > exp-err1 || framework_failure_ sed: file p1 line 1: 'y' command strings have different lengths EOF -returns_ 1 env LC_ALL=C sed -f p1 err1 || fail=1 -compare_ exp-err1 err1 || fail=1 + returns_ 1 env LC_ALL=C sed -f p1 err1 || fail=1 + compare_ exp-err1 err1 || fail=1 +fi # @@ -67,11 +70,14 @@ LC_ALL=en_US.UTF-8 sed -f p2 out2 || fail=1 compare_ exp2 out2 || fail=1 # in C locale, report error of mismatched length -cat <<\EOF > exp-err2 || framework_failure_ +# Skip if C locale is multibyte (e.g., Android bionic defaults to UTF-8). +if test "$(LC_ALL=C get-mb-cur-max C)" = 1; then + cat <<\EOF > exp-err2 || framework_failure_ sed: file p2 line 1: 'y' command strings have different lengths EOF -returns_ 1 env LC_ALL=C sed -f p2 err2 || fail=1 -compare_ exp-err2 err2 || fail=1 + returns_ 1 env LC_ALL=C sed -f p2 err2 || fail=1 + compare_ exp-err2 err2 || fail=1 +fi #