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/'

diff --git a/tests/misc/printenv b/tests/misc/printenv
index 67173ed58e8f60bb1ef322b3bdadd556be5f3257..4a569173a2b550bac14589c55a381376069e134d 100755 (executable)
--- a/tests/misc/printenv
+++ b/tests/misc/printenv
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${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 b0fe19cdb333b5b815896b0865087b736e6ebb40..b02352ba1843e62a7f2fe34627078ab1c966436a 100755 (executable)
--- 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 864dc0bb2d325d9b5d2de44bce70bbda74b01ba0..4853d392fcfe92ad7842b624ff463b6e73bf629d 100755 (executable)
--- a/tests/misc/printf-hex
+++ b/tests/misc/printf-hex
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${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 53f46b58fb05e3c14629b301e328420325a138d9..d37a329f5b63c3b21f16a03b910ab03663498a78 100755 (executable)
--- 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 b3d14c6ca729906e38f3e2c4d7521aa12b52184e..e8b088cd2c14bfd8825a0a1ade27172dc5127f34 100755 (executable)
--- 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 e01026674c7f4b9e9834d1abc8a9363336b0b552..21c5e400029b0fc2474ef58fe3bba1601c71467d 100755 (executable)
--- a/tests/misc/pwd-option
+++ b/tests/misc/pwd-option
@@ -17,7 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${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