tests: substitute the single-program $VERBOSE/--version uses

Automatically make all of the changes like this:

  -test "$VERBOSE" = yes && chgrp --version
  +print_ver_ chgrp

git grep -l 'VERBOSE.*--version'|xargs perl -pi -e \
  's/test "\$VERBOSE" = yes && (\w+) --version/print_ver_ $1/'

8 files changed, 8 insertions, 8 deletions

diff --git a/tests/install/basic-1 b/tests/install/basic-1
index 6470f5dd3..5e07bab00 100755
--- a/tests/install/basic-1
+++ b/tests/install/basic-1
@@ -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 && ginstall --version
+print_ver_ ginstall
 skip_if_root_
 
 dir=dir
diff --git a/tests/install/create-leading b/tests/install/create-leading
index acb92a9a6..3801030bc 100755
--- a/tests/install/create-leading
+++ b/tests/install/create-leading
@@ -20,7 +20,7 @@
 # that's the name of the binary in ../../src.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && ginstall --version
+print_ver_ ginstall
 
 
 file=file
diff --git a/tests/install/d-slashdot b/tests/install/d-slashdot
index b7cd17a22..7c43703c7 100755
--- a/tests/install/d-slashdot
+++ b/tests/install/d-slashdot
@@ -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 && install --version
+print_ver_ install
 
 
 ginstall -d d1/. || fail=1
diff --git a/tests/install/install-C b/tests/install/install-C
index ea6292c79..d9204e82d 100755
--- a/tests/install/install-C
+++ b/tests/install/install-C
@@ -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 && ginstall --version
+print_ver_ ginstall
 skip_if_setgid_
 
 mode1=0644
diff --git a/tests/install/install-C-root b/tests/install/install-C-root
index a36aa1efe..744c4c18c 100755
--- a/tests/install/install-C-root
+++ b/tests/install/install-C-root
@@ -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 && ginstall --version
+print_ver_ ginstall
 require_root_
 skip_if_setgid_
 
diff --git a/tests/install/install-C-selinux b/tests/install/install-C-selinux
index 8818c7359..d203a0b90 100755
--- a/tests/install/install-C-selinux
+++ b/tests/install/install-C-selinux
@@ -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 && ginstall --version
+print_ver_ ginstall
 require_selinux_
 
 
diff --git a/tests/install/strip-program b/tests/install/strip-program
index 71001d9d9..e54c2e114 100755
--- a/tests/install/strip-program
+++ b/tests/install/strip-program
@@ -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 && ginstall --version
+print_ver_ ginstall
 
 working_umask_or_skip_
 
diff --git a/tests/install/trap b/tests/install/trap
index 3092e9249..58bd5bcaa 100755
--- a/tests/install/trap
+++ b/tests/install/trap
@@ -18,7 +18,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && ginstall --version
+print_ver_ ginstall
 
 
 # Use a subshell and an exec to work around a bug in FreeBSD 5.0 /bin/sh.