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

19 files changed, 19 insertions, 19 deletions

diff --git a/tests/tail-2/F-vs-missing b/tests/tail-2/F-vs-missing
index 8c1d01898..50e8ab4b7 100755
--- a/tests/tail-2/F-vs-missing
+++ b/tests/tail-2/F-vs-missing
@@ -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 && tail --version
+print_ver_ tail
 
 debug='---disable-inotify'
 debug=
diff --git a/tests/tail-2/F-vs-rename b/tests/tail-2/F-vs-rename
index 98b36e745..93971d251 100755
--- a/tests/tail-2/F-vs-rename
+++ b/tests/tail-2/F-vs-rename
@@ -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 && tail --version
+print_ver_ tail
 
 touch a b || framework_failure
 
diff --git a/tests/tail-2/append-only b/tests/tail-2/append-only
index 32578fe57..e99bff2a2 100755
--- a/tests/tail-2/append-only
+++ b/tests/tail-2/append-only
@@ -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 && tail --version
+print_ver_ tail
 require_root_
 
 chattr_a_works=1
diff --git a/tests/tail-2/assert b/tests/tail-2/assert
index 1fdb76a77..560f6c7ce 100755
--- a/tests/tail-2/assert
+++ b/tests/tail-2/assert
@@ -24,7 +24,7 @@
 # due to a race condition in which a dev/inode pair is reused.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && tail --version
+print_ver_ tail
 
 # Not "expensive" per se, but sleeping for so long is annoying.
 very_expensive_
diff --git a/tests/tail-2/assert-2 b/tests/tail-2/assert-2
index fec0525ed..decbaaecb 100755
--- a/tests/tail-2/assert-2
+++ b/tests/tail-2/assert-2
@@ -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 && tail --version
+print_ver_ tail
 
 # Not "expensive" per se, but sleeping for so long is annoying.
 very_expensive_
diff --git a/tests/tail-2/big-4gb b/tests/tail-2/big-4gb
index 3496a622f..a32eaaa4a 100755
--- a/tests/tail-2/big-4gb
+++ b/tests/tail-2/big-4gb
@@ -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 && tail --version
+print_ver_ tail
 expensive_
 
 # Create a file of size exactly 4GB (2^32) with 8 bytes
diff --git a/tests/tail-2/flush-initial b/tests/tail-2/flush-initial
index df8810dcc..14a4f7bb0 100755
--- a/tests/tail-2/flush-initial
+++ b/tests/tail-2/flush-initial
@@ -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 && tail --version
+print_ver_ tail
 
 echo line > in || fail=1
 # Output should be buffered since we're writing to file
diff --git a/tests/tail-2/follow-stdin b/tests/tail-2/follow-stdin
index 1c50e8b66..0b39bc696 100755
--- a/tests/tail-2/follow-stdin
+++ b/tests/tail-2/follow-stdin
@@ -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 && tail --version
+print_ver_ tail
 
 echo line > exp || framework_failure
 echo line > in || framework_failure
diff --git a/tests/tail-2/infloop-1 b/tests/tail-2/infloop-1
index 7e98daf6a..38ee6f1f1 100755
--- a/tests/tail-2/infloop-1
+++ b/tests/tail-2/infloop-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 && tail --version
+print_ver_ tail
 
 yes > t &
 yes_pid=$!
diff --git a/tests/tail-2/inotify-hash-abuse b/tests/tail-2/inotify-hash-abuse
index d45668a69..86454c5fd 100755
--- a/tests/tail-2/inotify-hash-abuse
+++ b/tests/tail-2/inotify-hash-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 && tail --version
+print_ver_ tail
 
 # 9 is a magic number, related to internal details of tail.c and hash.c
 n=9
diff --git a/tests/tail-2/inotify-hash-abuse2 b/tests/tail-2/inotify-hash-abuse2
index f3018a57a..abd101cca 100755
--- a/tests/tail-2/inotify-hash-abuse2
+++ b/tests/tail-2/inotify-hash-abuse2
@@ -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 && tail --version
+print_ver_ tail
 
 touch f || framework_failure
 
diff --git a/tests/tail-2/inotify-race b/tests/tail-2/inotify-race
index 2deff69ae..8ff388b64 100755
--- a/tests/tail-2/inotify-race
+++ b/tests/tail-2/inotify-race
@@ -21,7 +21,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && tail --version
+print_ver_ tail
 
 # Don't run this test by default because sometimes it's skipped as noted below.
 # Also gdb has a bug in Debian's gdb-6.8-3 at least that causes it to not
diff --git a/tests/tail-2/pid b/tests/tail-2/pid
index b684a3617..a1fa58c4b 100755
--- a/tests/tail-2/pid
+++ b/tests/tail-2/pid
@@ -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 && tail --version
+print_ver_ tail
 getlimits_
 
 touch empty here || framework_failure
diff --git a/tests/tail-2/pipe-f b/tests/tail-2/pipe-f
index b6fef16d7..ae68a5f6f 100755
--- a/tests/tail-2/pipe-f
+++ b/tests/tail-2/pipe-f
@@ -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 && tail --version
+print_ver_ tail
 
 echo foo | timeout 10 tail -f -c3 > out || fail=1
 echo oo > exp || fail=1
diff --git a/tests/tail-2/pipe-f2 b/tests/tail-2/pipe-f2
index 426f37b50..0b9fd283c 100755
--- a/tests/tail-2/pipe-f2
+++ b/tests/tail-2/pipe-f2
@@ -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 && tail --version
+print_ver_ tail
 
 mkfifo_or_skip_ fifo
 
diff --git a/tests/tail-2/proc-ksyms b/tests/tail-2/proc-ksyms
index 3e63bfed8..ae0074063 100755
--- a/tests/tail-2/proc-ksyms
+++ b/tests/tail-2/proc-ksyms
@@ -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 && tail --version
+print_ver_ tail
 
 
 ksyms=/proc/ksyms
diff --git a/tests/tail-2/start-middle b/tests/tail-2/start-middle
index 404562d88..4727371fa 100755
--- a/tests/tail-2/start-middle
+++ b/tests/tail-2/start-middle
@@ -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 && tail --version
+print_ver_ tail
 
 (echo 1; echo 2) > k || framework_failure
 
diff --git a/tests/tail-2/tail-n0f b/tests/tail-2/tail-n0f
index d7badd74f..007e5d770 100755
--- a/tests/tail-2/tail-n0f
+++ b/tests/tail-2/tail-n0f
@@ -22,7 +22,7 @@
 # file, or if its contents don't look right.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && tail --version
+print_ver_ tail
 
 require_proc_pid_status_
 
diff --git a/tests/tail-2/wait b/tests/tail-2/wait
index 36cfa0e8c..a1c7fcdf8 100755
--- a/tests/tail-2/wait
+++ b/tests/tail-2/wait
@@ -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 && tail --version
+print_ver_ tail
 
 touch here || framework_failure
 { touch unreadable && chmod a-r unreadable; } || framework_failure