From 575b0ecbad2f34d5777f9562eebc2d0c815bfc5c Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 26 Dec 2019 15:59:11 -0800 Subject: [PATCH] test-framework-sh: tighten an internal grep regexp * tests/init.sh (gl_shell_test_script_): Tighten the grep regexp that helps test for a working printf. --- ChangeLog | 6 ++++++ tests/init.sh | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5161363599..1a0f532236 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2019-12-26 Jim Meyering + + test-framework-sh: tighten an internal grep regexp + * tests/init.sh (gl_shell_test_script_): Tighten the grep regexp + that helps test for a working printf. + 2019-12-26 Bruno Haible test-framework-sh: Avoid /bin/sh on AIX 7.2 due to its printf built-in. diff --git a/tests/init.sh b/tests/init.sh index 049e0d359c..d2c4a79001 100644 --- a/tests/init.sh +++ b/tests/init.sh @@ -161,10 +161,10 @@ fi gl_shell_test_script_=' test $(echo y) = y || exit 1 LC_ALL=en_US.UTF-8 printf "\\351" 2>/dev/null \ - | LC_ALL=C tr "\\351" x | LC_ALL=C grep x > /dev/null \ + | LC_ALL=C tr "\\351" x | LC_ALL=C grep "^x$" > /dev/null \ || exit 1 printf "\\351" 2>/dev/null \ - | LC_ALL=C tr "\\351" x | LC_ALL=C grep x > /dev/null \ + | LC_ALL=C tr "\\351" x | LC_ALL=C grep "^x$" > /dev/null \ || exit 1 f_local_() { local v=1; }; f_local_ || exit 1 f_dash_local_fail_() { local t=$(printf " 1"); }; f_dash_local_fail_ -- 2.39.5