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

21 files changed, 21 insertions, 21 deletions

diff --git a/tests/du/2g b/tests/du/2g
index 0021fdadc..da3cc6a48 100755
--- a/tests/du/2g
+++ b/tests/du/2g
@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && du --version
+print_ver_ du
 
 # Creating a 2GB file counts as `very expensive'.
 very_expensive_
diff --git a/tests/du/8gb b/tests/du/8gb
index f416111ed..ccfa67475 100755
--- a/tests/du/8gb
+++ b/tests/du/8gb
@@ -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 && du --version
+print_ver_ du
 require_sparse_support_
 
 dd bs=1 seek=8G of=big < /dev/null 2> /dev/null
diff --git a/tests/du/basic b/tests/du/basic
index b96d861c8..3d0f73e9c 100755
--- a/tests/du/basic
+++ b/tests/du/basic
@@ -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 && du --version
+print_ver_ du
 
 mkdir -p a/b d d/sub || framework_failure
 
diff --git a/tests/du/deref b/tests/du/deref
index 0dbf4854e..17f506219 100755
--- a/tests/du/deref
+++ b/tests/du/deref
@@ -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 && du --version
+print_ver_ du
 
 mkdir -p a/sub || framework_failure
 ln -s a/sub slink || framework_failure
diff --git a/tests/du/deref-args b/tests/du/deref-args
index 1743b0448..49bfc47c4 100755
--- a/tests/du/deref-args
+++ b/tests/du/deref-args
@@ -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 && du --version
+print_ver_ du
 
 mkdir -p dir/a || framework_failure
 ln -s dir slink || framework_failure
diff --git a/tests/du/exclude b/tests/du/exclude
index d3295cf68..06a489fdc 100755
--- a/tests/du/exclude
+++ b/tests/du/exclude
@@ -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 && du --version
+print_ver_ du
 
 mkdir -p a/b/c a/x/y a/u/v || framework_failure
 
diff --git a/tests/du/fd-leak b/tests/du/fd-leak
index 728ce0533..a9f00863f 100755
--- a/tests/du/fd-leak
+++ b/tests/du/fd-leak
@@ -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 && du --version
+print_ver_ du
 
 # Call this an expensive test.  It's not that expensive, but command line
 # limitations might induce failure on some losing systems.
diff --git a/tests/du/hard-link b/tests/du/hard-link
index 68a7e2245..576342f3f 100755
--- a/tests/du/hard-link
+++ b/tests/du/hard-link
@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && du --version
+print_ver_ du
 
 mkdir -p dir/sub
 ( cd dir &&
diff --git a/tests/du/inacc-dest b/tests/du/inacc-dest
index 24242815d..482cb308e 100755
--- a/tests/du/inacc-dest
+++ b/tests/du/inacc-dest
@@ -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 && du --version
+print_ver_ du
 skip_if_root_
 
 mkdir f && cd f && mkdir a b c d e && touch c/j && chmod a-x c \
diff --git a/tests/du/inacc-dir b/tests/du/inacc-dir
index 0be254c78..78bdaf327 100755
--- a/tests/du/inacc-dir
+++ b/tests/du/inacc-dir
@@ -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 && du --version
+print_ver_ du
 skip_if_root_
 
 mkdir -p a/sub || framework_failure
diff --git a/tests/du/inaccessible-cwd b/tests/du/inaccessible-cwd
index a1656b217..264a3816e 100755
--- a/tests/du/inaccessible-cwd
+++ b/tests/du/inaccessible-cwd
@@ -21,7 +21,7 @@
 # this test would fail.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && du --version
+print_ver_ du
 skip_if_root_
 
 cwd=`pwd`
diff --git a/tests/du/long-from-unreadable b/tests/du/long-from-unreadable
index 2b38e69e7..1da08bfaa 100755
--- a/tests/du/long-from-unreadable
+++ b/tests/du/long-from-unreadable
@@ -29,7 +29,7 @@
 # unnecessarily to using FTS_NOCHDIR mode in this corner case.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && du --version
+print_ver_ du
 
 proc_file=/proc/self/fd
 if test ! -d $proc_file; then
diff --git a/tests/du/long-sloop b/tests/du/long-sloop
index 391174a3d..b3abd4802 100755
--- a/tests/du/long-sloop
+++ b/tests/du/long-sloop
@@ -19,7 +19,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && du --version
+print_ver_ du
 
 # Create lots of directories, each containing a single symlink
 # pointing at the next directory in the list.
diff --git a/tests/du/no-deref b/tests/du/no-deref
index d56bc753e..c3e8840cf 100755
--- a/tests/du/no-deref
+++ b/tests/du/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 && du --version
+print_ver_ du
 
 mkdir -p dir/a/b || framework_failure
 ln -s dir slink || framework_failure
diff --git a/tests/du/no-x b/tests/du/no-x
index 580b527a4..0cee47d94 100755
--- a/tests/du/no-x
+++ b/tests/du/no-x
@@ -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 && du --version
+print_ver_ du
 skip_if_root_
 
 mkdir -p d/no-x/y || framework_failure
diff --git a/tests/du/one-file-system b/tests/du/one-file-system
index bb4d7cba1..7c02b41a5 100755
--- a/tests/du/one-file-system
+++ b/tests/du/one-file-system
@@ -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 && du --version
+print_ver_ du
 
 mkdir -p b/c y/z || framework_failure
 
diff --git a/tests/du/restore-wd b/tests/du/restore-wd
index bb2b165c5..a50a4518d 100755
--- a/tests/du/restore-wd
+++ b/tests/du/restore-wd
@@ -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 && du --version
+print_ver_ du
 
 mkdir a b || framework_failure
 
diff --git a/tests/du/slash b/tests/du/slash
index 3434e3ef3..daf5d6687 100755
--- a/tests/du/slash
+++ b/tests/du/slash
@@ -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 && du --version
+print_ver_ du
 require_readable_root_
 
 
diff --git a/tests/du/slink b/tests/du/slink
index 092ea1292..1340c7641 100755
--- a/tests/du/slink
+++ b/tests/du/slink
@@ -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 && du --version
+print_ver_ du
 
 # Determine if `.' is on a local (would non-NFS be sufficient?) file system.
 # At least on OSF/1 4.0d, when using an nfsv3 file system,
diff --git a/tests/du/trailing-slash b/tests/du/trailing-slash
index 70549a80d..a054a61bd 100755
--- a/tests/du/trailing-slash
+++ b/tests/du/trailing-slash
@@ -20,7 +20,7 @@
 # Before coreutils-4.5.3, it would remove a single trailing slash.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && du --version
+print_ver_ du
 
 mkdir -p dir/1/2 || framework_failure
 ln -s dir slink || framework_failure
diff --git a/tests/du/two-args b/tests/du/two-args
index ed544b091..4c71f2849 100755
--- a/tests/du/two-args
+++ b/tests/du/two-args
@@ -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 && du --version
+print_ver_ du
 
 # Run this test from a sub-directory one level deeper than normal,
 # so that the "du .." below doesn't traverse sibling directories