From a8c8484ee17f09ac92a27308b6ee5eaf4304bddc Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Wed, 17 Nov 2010 21:42:13 +0100 Subject: [PATCH] tests: convert "... env -- prog --version" uses E.g., -test "$VERBOSE" = yes && env -- pwd --version +print_ver_ pwd git grep -l 'VERBOSE.*--version'|xargs perl -pi -e \ 's/test "\$VERBOSE" = yes && env -- (\w+) --version/print_ver_ $1/' --- tests/misc/printenv | 2 +- tests/misc/printf | 2 +- tests/misc/printf-hex | 2 +- tests/misc/printf-surprise | 2 +- tests/misc/pwd-long | 2 +- tests/misc/pwd-option | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/misc/printenv b/tests/misc/printenv index 67173ed58e..4a569173a2 100755 --- a/tests/misc/printenv +++ b/tests/misc/printenv @@ -17,7 +17,7 @@ # along with this program. If not, see . . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && env -- printenv --version +print_ver_ printenv # Without arguments, printenv behaves like env. Some shells provide # printenv as a builtin, so we must invoke it via "env". diff --git a/tests/misc/printf b/tests/misc/printf index b0fe19cdb3..b02352ba18 100755 --- a/tests/misc/printf +++ b/tests/misc/printf @@ -19,7 +19,7 @@ prog="$abs_top_builddir/src/printf" . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && env -- printf --version +print_ver_ printf getlimits_ diff --git a/tests/misc/printf-hex b/tests/misc/printf-hex index 864dc0bb2d..4853d392fc 100755 --- a/tests/misc/printf-hex +++ b/tests/misc/printf-hex @@ -17,7 +17,7 @@ # along with this program. If not, see . . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && env -- printf --version +print_ver_ printf env printf '\x7e3\n' > out || fail=1 cat <<\EOF > exp diff --git a/tests/misc/printf-surprise b/tests/misc/printf-surprise index 53f46b58fb..d37a329f5b 100755 --- a/tests/misc/printf-surprise +++ b/tests/misc/printf-surprise @@ -19,7 +19,7 @@ prog=printf . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && env -- printf --version +print_ver_ printf require_ulimit_ diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long index b3d14c6ca7..e8b088cd2c 100755 --- a/tests/misc/pwd-long +++ b/tests/misc/pwd-long @@ -21,7 +21,7 @@ . $srcdir/require-perl . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && env -- pwd --version +print_ver_ pwd require_readable_root_ diff --git a/tests/misc/pwd-option b/tests/misc/pwd-option index e01026674c..21c5e40002 100755 --- a/tests/misc/pwd-option +++ b/tests/misc/pwd-option @@ -17,7 +17,7 @@ # along with this program. If not, see . . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && env -- pwd --version +print_ver_ pwd mkdir -p a/b || framework_failure ln -s a/b c || framework_failure -- 2.47.2