summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <meyering@meta.com>2023-01-29 16:23:33 -0800
committerJim Meyering <meyering@meta.com>2023-01-29 17:36:34 -0800
commitfa9e4e4fc0b2c5be1289dafd02995e5badbac1b2 (patch)
treef91a4ebb1e8b6b28ed7ff095897e0ee5fedaf265
parentc2683c7ba2d0e476bab4c4462e601a99d3747f55 (diff)
downloadsed-fa9e4e4fc0b2c5be1289dafd02995e5badbac1b2.tar.gz
tests: reflect recent diagnostic change
v4.9-14-g3d75b4a changed the diagnostic, but did not update the occurrences of the diagnostic in expected test outputs. * testsuite/compile-errors.sh: Accommodate changed diagnostic. * testsuite/mb-y-translate.sh: Likewise. * testsuite/normalize-text.sh: Likewise. Reported by Bruno Haible in https://bugs.gnu.org/61159
-rw-r--r--testsuite/compile-errors.sh2
-rwxr-xr-xtestsuite/mb-y-translate.sh8
-rw-r--r--testsuite/normalize-text.sh2
3 files changed, 6 insertions, 6 deletions
diff --git a/testsuite/compile-errors.sh b/testsuite/compile-errors.sh
index d4198ee..fa83758 100644
--- a/testsuite/compile-errors.sh
+++ b/testsuite/compile-errors.sh
@@ -262,7 +262,7 @@ compare_ exp-unterm-y err-unterm-y5 || fail=1
# Y command with bad legth (Y_CMD_LEN)
# TODO: check with multibyte strings.
cat <<\EOF >exp-bad-y-len || framework_failure_
-sed: -e expression #1, char 7: strings for `y' command are different lengths
+sed: -e expression #1, char 7: `y' command strings have different lengths
EOF
returns_ 1 sed 'y/a/bb/' </dev/null 2>err-bad-y-len || fail=1
compare_ exp-bad-y-len err-bad-y-len || fail=1
diff --git a/testsuite/mb-y-translate.sh b/testsuite/mb-y-translate.sh
index 508e73b..7aa04de 100755
--- a/testsuite/mb-y-translate.sh
+++ b/testsuite/mb-y-translate.sh
@@ -50,7 +50,7 @@ compare_ exp1 out1 || fail=1
# in C locale, report error of mismatched length
cat <<\EOF > exp-err1 || framework_failure_
-sed: file p1 line 1: strings for `y' command are different lengths
+sed: file p1 line 1: `y' command strings have different lengths
EOF
returns_ 1 env LC_ALL=C sed -f p1 </dev/null 2>err1 || fail=1
compare_ exp-err1 err1 || fail=1
@@ -68,7 +68,7 @@ compare_ exp2 out2 || fail=1
# in C locale, report error of mismatched length
cat <<\EOF > exp-err2 || framework_failure_
-sed: file p2 line 1: strings for `y' command are different lengths
+sed: file p2 line 1: `y' command strings have different lengths
EOF
returns_ 1 env LC_ALL=C sed -f p2 </dev/null 2>err2 || fail=1
compare_ exp-err2 err2 || fail=1
@@ -116,7 +116,7 @@ done
# multibyte themselves.
printf 'y/abc/d/' > p7 || framework_failure_
cat <<\EOF > exp-err7 || framework_failure_
-sed: file p7 line 1: strings for `y' command are different lengths
+sed: file p7 line 1: `y' command strings have different lengths
EOF
returns_ 1 env LC_ALL=en_US.UTF-8 sed -f p7 </dev/null 2>err7 || fail=1
@@ -124,7 +124,7 @@ compare_ exp-err7 err7 || fail=1
printf 'y/a/bcd/' > p8 || framework_failure_
cat <<\EOF > exp-err8 || framework_failure_
-sed: file p8 line 1: strings for `y' command are different lengths
+sed: file p8 line 1: `y' command strings have different lengths
EOF
returns_ 1 env LC_ALL=en_US.UTF-8 sed -f p8 </dev/null 2>err8 || fail=1
diff --git a/testsuite/normalize-text.sh b/testsuite/normalize-text.sh
index 6592bf3..a34fe5c 100644
--- a/testsuite/normalize-text.sh
+++ b/testsuite/normalize-text.sh
@@ -73,7 +73,7 @@ compare_ exp3 out3 || fail=1
# TODO: is this a bug?
# compare with 'y/a/\d/' and 'y/a/\x/'
cat <<\EOF >exp-err-c || framework_failure_
-sed: -e expression #1, char 7: strings for `y' command are different lengths
+sed: -e expression #1, char 7: `y' command strings have different lengths
EOF
returns_ 1 sed 'y/a/\c/' </dev/null 2>err-c || fail=1
compare_ exp-err-c err-c || fail=1