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

44 files changed, 44 insertions, 44 deletions

diff --git a/tests/cp/abuse b/tests/cp/abuse
index fb5e4358c..712737b1d 100755
--- a/tests/cp/abuse
+++ b/tests/cp/abuse
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir a b c || framework_failure
 ln -s ../t a/1 || framework_failure
diff --git a/tests/cp/backup-1 b/tests/cp/backup-1
index 690846214..94c1f2a67 100755
--- a/tests/cp/backup-1
+++ b/tests/cp/backup-1
@@ -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 && cp --version
+print_ver_ cp
 
 suffix=.b
 file=b1.$$
diff --git a/tests/cp/backup-dir b/tests/cp/backup-dir
index c1718dedc..33298e699 100755
--- a/tests/cp/backup-dir
+++ b/tests/cp/backup-dir
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir x y || framework_failure
 
diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src
index 8a8b48069..301088c0b 100755
--- a/tests/cp/backup-is-src
+++ b/tests/cp/backup-is-src
@@ -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 && cp --version
+print_ver_ cp
 
 echo a > a || framework_failure
 echo a-tilde > a~ || framework_failure
diff --git a/tests/cp/capability b/tests/cp/capability
index 3a241d058..c188284a5 100755
--- a/tests/cp/capability
+++ b/tests/cp/capability
@@ -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 && ls --version
+print_ver_ ls
 require_root_
 working_umask_or_skip_
 
diff --git a/tests/cp/cp-HL b/tests/cp/cp-HL
index f2a2dc438..cca2350c4 100755
--- a/tests/cp/cp-HL
+++ b/tests/cp/cp-HL
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir src-dir dest-dir || framework_failure
 echo f > f || framework_failure
diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux
index bfc79562d..d5e744bba 100755
--- a/tests/cp/cp-a-selinux
+++ b/tests/cp/cp-a-selinux
@@ -20,7 +20,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && cp --version
+print_ver_ cp
 require_root_
 require_selinux_
 
diff --git a/tests/cp/cp-deref b/tests/cp/cp-deref
index 8315a6254..36f9d094f 100755
--- a/tests/cp/cp-deref
+++ b/tests/cp/cp-deref
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir a b c d || framework_failure
 ln -s ../c a || framework_failure
diff --git a/tests/cp/cp-i b/tests/cp/cp-i
index 8e86267fa..5902fc605 100755
--- a/tests/cp/cp-i
+++ b/tests/cp/cp-i
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir -p a b/a/c || framework_failure
 touch a/c || framework_failure
diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup
index ad7bfa511..d77568575 100755
--- a/tests/cp/cp-mv-backup
+++ b/tests/cp/cp-mv-backup
@@ -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 && cp --version
+print_ver_ cp
 
 umask 022
 
diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents
index 22100b502..5e8f2c92c 100755
--- a/tests/cp/cp-parents
+++ b/tests/cp/cp-parents
@@ -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 && mv --version
+print_ver_ mv
 
 working_umask_or_skip_
 
diff --git a/tests/cp/deref-slink b/tests/cp/deref-slink
index a11bd0dc9..bf08321f0 100755
--- a/tests/cp/deref-slink
+++ b/tests/cp/deref-slink
@@ -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 && cp --version
+print_ver_ cp
 
 touch f slink-target || framework_failure
 ln -s slink-target slink || framework_failure
diff --git a/tests/cp/dir-rm-dest b/tests/cp/dir-rm-dest
index 2923a474e..abddfe22c 100755
--- a/tests/cp/dir-rm-dest
+++ b/tests/cp/dir-rm-dest
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir d e || framework_failure
 
diff --git a/tests/cp/dir-slash b/tests/cp/dir-slash
index 18050a3af..156987f90 100755
--- a/tests/cp/dir-slash
+++ b/tests/cp/dir-slash
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir dir1 dir2 || framework_failure
 touch dir1/file || framework_failure
diff --git a/tests/cp/dir-vs-file b/tests/cp/dir-vs-file
index 499014184..ca8db2e86 100755
--- a/tests/cp/dir-vs-file
+++ b/tests/cp/dir-vs-file
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir dir || framework_failure
 touch file || framework_failure
diff --git a/tests/cp/existing-perm-race b/tests/cp/existing-perm-race
index f1c7bc1ad..f048eb160 100755
--- a/tests/cp/existing-perm-race
+++ b/tests/cp/existing-perm-race
@@ -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 && cp --version
+print_ver_ cp
 
 require_membership_in_two_groups_
 
diff --git a/tests/cp/fail-perm b/tests/cp/fail-perm
index cd763f7da..f6a77a136 100755
--- a/tests/cp/fail-perm
+++ b/tests/cp/fail-perm
@@ -16,7 +16,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && cp --version
+print_ver_ cp
 skip_if_root_
 
 chmod g-s . || framework_failure
diff --git a/tests/cp/file-perm-race b/tests/cp/file-perm-race
index 6b3b60450..140c7ee1f 100755
--- a/tests/cp/file-perm-race
+++ b/tests/cp/file-perm-race
@@ -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 && cp --version
+print_ver_ cp
 
 # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least
 require_local_dir_
diff --git a/tests/cp/into-self b/tests/cp/into-self
index 3341d1a8b..5244a852a 100755
--- a/tests/cp/into-self
+++ b/tests/cp/into-self
@@ -22,7 +22,7 @@
 #   cp: can't copy a directory `dir' into itself `dir/dir'
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && cp --version
+print_ver_ cp
 
 mkdir a dir || framework_failure
 
diff --git a/tests/cp/link b/tests/cp/link
index f0bd241f9..89d060289 100755
--- a/tests/cp/link
+++ b/tests/cp/link
@@ -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 && cp --version
+print_ver_ cp
 
 touch src || framework_failure
 touch dest || framework_failure
diff --git a/tests/cp/link-heap b/tests/cp/link-heap
index f5ed6e60e..2a0c04876 100755
--- a/tests/cp/link-heap
+++ b/tests/cp/link-heap
@@ -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 && cp --version
+print_ver_ cp
 expensive_
 require_ulimit_
 
diff --git a/tests/cp/link-no-deref b/tests/cp/link-no-deref
index d575ec851..794d3df04 100755
--- a/tests/cp/link-no-deref
+++ b/tests/cp/link-no-deref
@@ -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 && cp --version
+print_ver_ cp
 
 ln -s no-such-file dangling-slink || framework_failure
 
diff --git a/tests/cp/link-preserve b/tests/cp/link-preserve
index fe5ad42c9..c4f9774f5 100755
--- a/tests/cp/link-preserve
+++ b/tests/cp/link-preserve
@@ -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 && cp --version
+print_ver_ cp
 
 touch a || framework_failure
 ln a b || framework_failure
diff --git a/tests/cp/no-deref-link1 b/tests/cp/no-deref-link1
index f0d1a9e9b..6be72cff0 100755
--- a/tests/cp/no-deref-link1
+++ b/tests/cp/no-deref-link1
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir a b
 msg=bar
diff --git a/tests/cp/no-deref-link2 b/tests/cp/no-deref-link2
index 2351589a7..0ccb911c3 100755
--- a/tests/cp/no-deref-link2
+++ b/tests/cp/no-deref-link2
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir b
 msg=bar
diff --git a/tests/cp/no-deref-link3 b/tests/cp/no-deref-link3
index 1053b3ef7..d648f3470 100755
--- a/tests/cp/no-deref-link3
+++ b/tests/cp/no-deref-link3
@@ -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 && cp --version
+print_ver_ cp
 
 msg=bar
 echo $msg > a
diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm
index 82dd913ac..62aa80bfb 100755
--- a/tests/cp/parent-perm
+++ b/tests/cp/parent-perm
@@ -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 && cp --version
+print_ver_ cp
 
 working_umask_or_skip_
 # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least
diff --git a/tests/cp/parent-perm-race b/tests/cp/parent-perm-race
index b6374aecd..fd39340bd 100755
--- a/tests/cp/parent-perm-race
+++ b/tests/cp/parent-perm-race
@@ -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 && cp --version
+print_ver_ cp
 
 # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least
 require_local_dir_
diff --git a/tests/cp/preserve-2 b/tests/cp/preserve-2
index d7565df3b..5f3e0da1a 100755
--- a/tests/cp/preserve-2
+++ b/tests/cp/preserve-2
@@ -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 && cp --version
+print_ver_ cp
 
 # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least
 require_local_dir_
diff --git a/tests/cp/preserve-gid b/tests/cp/preserve-gid
index 6fa5293c7..a25cbb478 100755
--- a/tests/cp/preserve-gid
+++ b/tests/cp/preserve-gid
@@ -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 && cp --version
+print_ver_ cp
 
 require_root_
 
diff --git a/tests/cp/preserve-slink-time b/tests/cp/preserve-slink-time
index 5a61b7e8c..a2245f29f 100755
--- a/tests/cp/preserve-slink-time
+++ b/tests/cp/preserve-slink-time
@@ -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 && cp --version
+print_ver_ cp
 
 grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null ||
 grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null ||
diff --git a/tests/cp/proc-short-read b/tests/cp/proc-short-read
index 2bc2a6195..3525d00ca 100755
--- a/tests/cp/proc-short-read
+++ b/tests/cp/proc-short-read
@@ -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 && cp --version
+print_ver_ cp
 
 kall=/proc/kallsyms
 
diff --git a/tests/cp/proc-zero-len b/tests/cp/proc-zero-len
index ca28fa428..397b91e49 100755
--- a/tests/cp/proc-zero-len
+++ b/tests/cp/proc-zero-len
@@ -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 && cp --version
+print_ver_ cp
 
 touch empty || framework_failure
 
diff --git a/tests/cp/r-vs-symlink b/tests/cp/r-vs-symlink
index 7d9dfd8e4..34d6a4e1b 100755
--- a/tests/cp/r-vs-symlink
+++ b/tests/cp/r-vs-symlink
@@ -21,7 +21,7 @@
 # cp: `slink': WARNING: using -r to copy symbolic links is not portable
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && cp --version
+print_ver_ cp
 
 echo abc > foo || framework_failure
 ln -s foo slink || framework_failure
diff --git a/tests/cp/reflink-auto b/tests/cp/reflink-auto
index 7d61ed25b..de24df956 100755
--- a/tests/cp/reflink-auto
+++ b/tests/cp/reflink-auto
@@ -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 && cp --version
+print_ver_ cp
 
 cleanup_() { rm -rf "$other_partition_tmpdir"; }
 . "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/cp/reflink-perm b/tests/cp/reflink-perm
index a330584c1..6ae8ce43a 100755
--- a/tests/cp/reflink-perm
+++ b/tests/cp/reflink-perm
@@ -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 && cp --version
+print_ver_ cp
 
 
 : > time_check
diff --git a/tests/cp/same-file b/tests/cp/same-file
index 97b5b2909..873ac2d40 100755
--- a/tests/cp/same-file
+++ b/tests/cp/same-file
@@ -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 && cp --version
+print_ver_ cp
 
 # Unset CDPATH.  Otherwise, output from the `cd dir' command
 # can make this test fail.
diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink
index 69e0c9511..4918a3597 100755
--- a/tests/cp/slink-2-slink
+++ b/tests/cp/slink-2-slink
@@ -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 && cp --version
+print_ver_ cp
 
 touch file || framework_failure
 ln -s file a || framework_failure
diff --git a/tests/cp/sparse b/tests/cp/sparse
index 60e226b27..9391a9a4d 100755
--- a/tests/cp/sparse
+++ b/tests/cp/sparse
@@ -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 && cp --version
+print_ver_ cp
 require_sparse_support_
 
 # Create a sparse file.
diff --git a/tests/cp/special-bits b/tests/cp/special-bits
index f09e499fc..d468fe376 100755
--- a/tests/cp/special-bits
+++ b/tests/cp/special-bits
@@ -21,7 +21,7 @@
 # The bug was fixed in 4.0z.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && cp --version
+print_ver_ cp
 require_root_
 
 touch a b c || framework_failure
diff --git a/tests/cp/special-f b/tests/cp/special-f
index 6c0b13734..79875b205 100755
--- a/tests/cp/special-f
+++ b/tests/cp/special-f
@@ -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 && cp --version
+print_ver_ cp
 
 mkfifo fifo ||
   skip_test_ "fifos not supported"
diff --git a/tests/cp/src-base-dot b/tests/cp/src-base-dot
index 73e4f6ff7..ff07bb9f5 100755
--- a/tests/cp/src-base-dot
+++ b/tests/cp/src-base-dot
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir x y || framework_failure
 
diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash
index dfc9b2bf0..a104dd66a 100755
--- a/tests/cp/symlink-slash
+++ b/tests/cp/symlink-slash
@@ -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 && cp --version
+print_ver_ cp
 
 mkdir dir || framework_failure
 ln -s dir symlink || framework_failure
diff --git a/tests/cp/thru-dangling b/tests/cp/thru-dangling
index 592dda2a5..4d87d35b4 100755
--- a/tests/cp/thru-dangling
+++ b/tests/cp/thru-dangling
@@ -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 && cp --version
+print_ver_ cp
 
 ln -s no-such dangle || framework_failure
 echo hi > f || framework_failure