From 1b8446e1cd6dcd0644c1c96b952e11cbc472a24d Mon Sep 17 00:00:00 2001 From: Jun-ichi Takimoto Date: Wed, 27 Sep 2023 23:45:00 +0900 Subject: [PATCH] 52188: skip tests that fail if multibyte is not available --- ChangeLog | 3 +++ Test/D04parameter.ztst | 20 ++++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 506635756..4c0a27878 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2023-09-27 Jun-ichi Takimoto + * 52188: Test/D04parameter.ztst: skip tests that fail if + multibyte is not available + * 52169: Src/subst.c, Src/utils.c: a few more improvemets of (#) 2023-09-23 Bart Schaefer diff --git a/Test/D04parameter.ztst b/Test/D04parameter.ztst index 12ae1a446..c2008582c 100644 --- a/Test/D04parameter.ztst +++ b/Test/D04parameter.ztst @@ -2807,21 +2807,29 @@ F:behavior, see http://austingroupbugs.net/view.php?id=888 0:${(#)...}: array of bad math expressions, printf >az - : ${(#X):-0x80} + if [[ ! -o multibyte ]]; then + ZTST_skip='(#X) accepts any byte if multibyte is off' + else + : ${(#X):-0x80} + fi 1:${(#X)...}: out-of-range character -?(eval):1: character not in range +?(eval):4: character not in range [[ ${(#):-0x80} = $'\x80' ]] && echo OK 0:${(#)...}: out-of-range character >OK a=( 0x80 0x81 ) - : ${(#X)a} -1:${(#X)...}: array of out-of-range characters -?(eval):2: character not in range - printf "%s\n" ${(#)a} | while read x; do echo $(( #x )); done 0:${(#)...}: array of out-of-range characters >128 >129 + + if [[ ! -o multibyte ]]; then + ZTST_skip='(#X) accepts any byte if multibyte is off' + else + : ${(#X)a} + fi +1:${(#X)...}: array of out-of-range characters +?(eval):4: character not in range