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

86 files changed, 86 insertions, 86 deletions

diff --git a/tests/misc/arch b/tests/misc/arch
index 462919f57..a6a209f4f 100755
--- a/tests/misc/arch
+++ b/tests/misc/arch
@@ -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 && arch --version
+print_ver_ arch
 
 require_built_ arch
 
diff --git a/tests/misc/cat-buf b/tests/misc/cat-buf
index 303c4e268..0d9fe349c 100755
--- a/tests/misc/cat-buf
+++ b/tests/misc/cat-buf
@@ -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 && cat --version
+print_ver_ cat
 
 # Use a fifo rather than a pipe in the tests below
 # so that the producer (cat) will wait until the
diff --git a/tests/misc/cat-proc b/tests/misc/cat-proc
index 7214c25c8..e29dbcbf9 100755
--- a/tests/misc/cat-proc
+++ b/tests/misc/cat-proc
@@ -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 && cat --version
+print_ver_ cat
 
 
 f=/proc/cpuinfo
diff --git a/tests/misc/chcon b/tests/misc/chcon
index 3aefab51b..cea296bdd 100755
--- a/tests/misc/chcon
+++ b/tests/misc/chcon
@@ -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 && chcon --version
+print_ver_ chcon
 require_root_
 require_selinux_
 skip_if_mcstransd_is_running_
diff --git a/tests/misc/chcon-fail b/tests/misc/chcon-fail
index 4daa848cf..056525257 100755
--- a/tests/misc/chcon-fail
+++ b/tests/misc/chcon-fail
@@ -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 && chcon --version
+print_ver_ chcon
 
 
 # neither context nor file
diff --git a/tests/misc/chroot-credentials b/tests/misc/chroot-credentials
index e671f7fc8..cfa903dd5 100755
--- a/tests/misc/chroot-credentials
+++ b/tests/misc/chroot-credentials
@@ -18,7 +18,7 @@
 
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && chroot --version
+print_ver_ chroot
 
 require_root_
 
diff --git a/tests/misc/chroot-fail b/tests/misc/chroot-fail
index a3044f70b..b7316684b 100755
--- a/tests/misc/chroot-fail
+++ b/tests/misc/chroot-fail
@@ -18,7 +18,7 @@
 
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && chroot --version
+print_ver_ chroot
 
 
 # These tests verify exact status of internal failure; since none of
diff --git a/tests/misc/close-stdout b/tests/misc/close-stdout
index e236558db..b4b4023ce 100755
--- a/tests/misc/close-stdout
+++ b/tests/misc/close-stdout
@@ -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 && rm --version
+print_ver_ rm
 
 p=$abs_top_builddir
 
diff --git a/tests/misc/csplit b/tests/misc/csplit
index 98c704c14..a71d87326 100755
--- a/tests/misc/csplit
+++ b/tests/misc/csplit
@@ -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 && csplit --version
+print_ver_ csplit
 
 
 # csplit could get a failed assertion to 2.0.17
diff --git a/tests/misc/csplit-1000 b/tests/misc/csplit-1000
index 259d514ca..4612d1513 100755
--- a/tests/misc/csplit-1000
+++ b/tests/misc/csplit-1000
@@ -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 && csplit --version
+print_ver_ csplit
 
 # Before coreutils-8.7, this would overrun the 6-byte filename_space buffer.
 # It's hard to detect that without using valgrind, so here, we simply
diff --git a/tests/misc/csplit-heap b/tests/misc/csplit-heap
index 0e7f8b2ef..5e754f437 100755
--- a/tests/misc/csplit-heap
+++ b/tests/misc/csplit-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 && csplit --version
+print_ver_ csplit
 
 require_ulimit_
 
diff --git a/tests/misc/date-sec b/tests/misc/date-sec
index a9f19a55b..e650b3e94 100755
--- a/tests/misc/date-sec
+++ b/tests/misc/date-sec
@@ -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 && date --version
+print_ver_ date
 
 
 
diff --git a/tests/misc/df b/tests/misc/df
index 22451c53a..d30b7b2bd 100755
--- a/tests/misc/df
+++ b/tests/misc/df
@@ -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 && df --version
+print_ver_ df
 
 case `df .` in
 *'
diff --git a/tests/misc/df-P b/tests/misc/df-P
index bd4e0bc7c..c7be27208 100755
--- a/tests/misc/df-P
+++ b/tests/misc/df-P
@@ -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 && df --version
+print_ver_ df
 
 
               df -P . > t1 || fail=1
diff --git a/tests/misc/env b/tests/misc/env
index 11343a1ff..1a20ffe1a 100755
--- a/tests/misc/env
+++ b/tests/misc/env
@@ -18,7 +18,7 @@
 
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && env --version
+print_ver_ env
 
 
 # Verify clearing the environment
diff --git a/tests/misc/false-status b/tests/misc/false-status
index a8e1fa624..a802dfb77 100755
--- a/tests/misc/false-status
+++ b/tests/misc/false-status
@@ -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 && false --version
+print_ver_ false
 
 false --version > /dev/null && fail=1
 false --help > /dev/null && fail=1
diff --git a/tests/misc/fmt-long-line b/tests/misc/fmt-long-line
index 3fb98e572..89a5ea78f 100755
--- a/tests/misc/fmt-long-line
+++ b/tests/misc/fmt-long-line
@@ -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 && fmt --version
+print_ver_ fmt
 
 printf '%2030s\n' ' '|sed 's/../ y/g' > in || framework_failure
 
diff --git a/tests/misc/groups-dash b/tests/misc/groups-dash
index ea4b94ac7..0fe371691 100755
--- a/tests/misc/groups-dash
+++ b/tests/misc/groups-dash
@@ -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 && groups --version
+print_ver_ groups
 require_built_ groups
 
 # Coreutils 6.9 and earlier failed to display information on first argument
diff --git a/tests/misc/groups-version b/tests/misc/groups-version
index ec157a26c..3a131bf81 100755
--- a/tests/misc/groups-version
+++ b/tests/misc/groups-version
@@ -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 && groups --version
+print_ver_ groups
 require_built_ groups
 
 groups --version | sed 's/^groups/id/; /^$/q' > out || fail=1
diff --git a/tests/misc/head-c b/tests/misc/head-c
index 70a0b45e8..7c46d0c94 100755
--- a/tests/misc/head-c
+++ b/tests/misc/head-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 && head --version
+print_ver_ head
 
 echo abc > in || framework_failure
 
diff --git a/tests/misc/head-pos b/tests/misc/head-pos
index 8d5d00a27..fed1c23f2 100755
--- a/tests/misc/head-pos
+++ b/tests/misc/head-pos
@@ -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 && head --version
+print_ver_ head
 
 (echo a; echo b) > in || framework_failure
 
diff --git a/tests/misc/id-context b/tests/misc/id-context
index 8e380944c..3b980ab02 100755
--- a/tests/misc/id-context
+++ b/tests/misc/id-context
@@ -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 && id --version
+print_ver_ id
 # Require selinux - when selinux is disabled, id never prints scontext.
 require_selinux_
 
diff --git a/tests/misc/id-groups b/tests/misc/id-groups
index 8a6eea34d..0f67d54c4 100755
--- a/tests/misc/id-groups
+++ b/tests/misc/id-groups
@@ -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 && id --version
+print_ver_ id
 
 id -G $(id -nu) || fail=1
 
diff --git a/tests/misc/ls-time b/tests/misc/ls-time
index 721fb8128..9e6c89e4a 100755
--- a/tests/misc/ls-time
+++ b/tests/misc/ls-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 && ls --version
+print_ver_ ls
 
 # Avoid any possible glitches due to daylight-saving changes near the
 # time stamps used during the test.
diff --git a/tests/misc/md5sum-parallel b/tests/misc/md5sum-parallel
index fdbc4c202..0e873b18e 100755
--- a/tests/misc/md5sum-parallel
+++ b/tests/misc/md5sum-parallel
@@ -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 && md5sum --version
+print_ver_ md5sum
 
 (mkdir tmp && cd tmp && seq 500 | xargs touch)
 
diff --git a/tests/misc/mknod b/tests/misc/mknod
index 049ed0f72..15bb8bf45 100755
--- a/tests/misc/mknod
+++ b/tests/misc/mknod
@@ -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 && mknod --version
+print_ver_ mknod
 
 
 umask 777
diff --git a/tests/misc/nice b/tests/misc/nice
index 939a9aa62..2948ce23e 100755
--- a/tests/misc/nice
+++ b/tests/misc/nice
@@ -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 && nice --version
+print_ver_ nice
 
 tests='
 0 empty 10
diff --git a/tests/misc/nice-fail b/tests/misc/nice-fail
index 6c8314c6b..b81fda611 100755
--- a/tests/misc/nice-fail
+++ b/tests/misc/nice-fail
@@ -18,7 +18,7 @@
 
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && nice --version
+print_ver_ nice
 
 
 # These tests verify exact status of internal failure.
diff --git a/tests/misc/nl b/tests/misc/nl
index 81d0a40de..36fdde5f2 100755
--- a/tests/misc/nl
+++ b/tests/misc/nl
@@ -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 && nl --version
+print_ver_ nl
 
 
 echo a | nl > out || fail=1
diff --git a/tests/misc/nohup b/tests/misc/nohup
index 9d3d76aa6..c7054c5f4 100755
--- a/tests/misc/nohup
+++ b/tests/misc/nohup
@@ -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 && nohup --version
+print_ver_ nohup
 
 
 nohup sh -c 'echo stdout; echo stderr 1>&2' 2>err || fail=1
diff --git a/tests/misc/nproc-avail b/tests/misc/nproc-avail
index 424bbe043..0802c5ca9 100755
--- a/tests/misc/nproc-avail
+++ b/tests/misc/nproc-avail
@@ -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 && nproc --version
+print_ver_ nproc
 
 all=$(nproc --all)
 available=$(OMP_NUM_THREADS= nproc)
diff --git a/tests/misc/nproc-positive b/tests/misc/nproc-positive
index 1f12c9b96..2af66fabf 100755
--- a/tests/misc/nproc-positive
+++ b/tests/misc/nproc-positive
@@ -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 && nproc --version
+print_ver_ nproc
 
 for mode in --all ''; do
     procs=$(nproc $mode)
diff --git a/tests/misc/od-N b/tests/misc/od-N
index 6d09f8e98..958f9568c 100755
--- a/tests/misc/od-N
+++ b/tests/misc/od-N
@@ -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 && od --version
+print_ver_ od
 
 echo abcdefg > in || framework_failure
 
diff --git a/tests/misc/od-multiple-t b/tests/misc/od-multiple-t
index 0aecaf05b..665ab09c8 100755
--- a/tests/misc/od-multiple-t
+++ b/tests/misc/od-multiple-t
@@ -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 && od --version
+print_ver_ od
 
 # Choose 48 bytes for the input, as that is lcm for 1, 2, 4, 8, 12, 16;
 # we don't anticipate any other native object size on modern hardware.
diff --git a/tests/misc/od-x8 b/tests/misc/od-x8
index d9c933800..02a6966e7 100755
--- a/tests/misc/od-x8
+++ b/tests/misc/od-x8
@@ -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 && od --version
+print_ver_ od
 
 od -t x8 /dev/null >/dev/null ||
   skip_test_ "od lacks support for 8-byte quantities"
diff --git a/tests/misc/pathchk1 b/tests/misc/pathchk1
index ae32c9c29..394a94a5c 100755
--- a/tests/misc/pathchk1
+++ b/tests/misc/pathchk1
@@ -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 && pathchk --version
+print_ver_ pathchk
 skip_if_root_
 
 touch file || framework_failure
diff --git a/tests/misc/ptx-overrun b/tests/misc/ptx-overrun
index 637c61d13..f4025bb9e 100755
--- a/tests/misc/ptx-overrun
+++ b/tests/misc/ptx-overrun
@@ -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 && ptx --version
+print_ver_ ptx
 
 # Using a long file name makes an abort more likely.
 # Even with no file name, valgrind detects the buffer overrun.
diff --git a/tests/misc/readlink-fp-loop b/tests/misc/readlink-fp-loop
index ab66fa12a..7492a9d0e 100755
--- a/tests/misc/readlink-fp-loop
+++ b/tests/misc/readlink-fp-loop
@@ -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 && readlink --version
+print_ver_ readlink
 cwd=$("$abs_top_builddir/src/pwd")
 
 # To trigger this bug, we have to construct a name/situation during
diff --git a/tests/misc/runcon-no-reorder b/tests/misc/runcon-no-reorder
index ee20df041..9cbc78d8e 100755
--- a/tests/misc/runcon-no-reorder
+++ b/tests/misc/runcon-no-reorder
@@ -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 && runcon --version
+print_ver_ runcon
 
 diag='runcon: runcon may be used only on a SELinux kernel'
 echo "$diag" > exp || framework_failure
diff --git a/tests/misc/seq-long-double b/tests/misc/seq-long-double
index e07ea82db..e687ac22c 100755
--- a/tests/misc/seq-long-double
+++ b/tests/misc/seq-long-double
@@ -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 && seq --version
+print_ver_ seq
 getlimits_
 
 # Run this test only with glibc and sizeof (long double) > sizeof (double).
diff --git a/tests/misc/shred-exact b/tests/misc/shred-exact
index 2aeef77ac..a1a8e1d74 100755
--- a/tests/misc/shred-exact
+++ b/tests/misc/shred-exact
@@ -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 && shred --version
+print_ver_ shred
 
 
 for opt in --exact --zero; do
diff --git a/tests/misc/shred-passes b/tests/misc/shred-passes
index 2298553eb..a460785ab 100755
--- a/tests/misc/shred-passes
+++ b/tests/misc/shred-passes
@@ -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 && shred --version
+print_ver_ shred
 
 
 # shred a single letter, zero length file which should result in
diff --git a/tests/misc/shred-remove b/tests/misc/shred-remove
index 0e2423cff..8f0218db0 100755
--- a/tests/misc/shred-remove
+++ b/tests/misc/shred-remove
@@ -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 && shred --version
+print_ver_ shred
 skip_if_root_
 
 # The length of the basename is what matters.
diff --git a/tests/misc/shuf b/tests/misc/shuf
index e612ee0bc..b828c84b5 100755
--- a/tests/misc/shuf
+++ b/tests/misc/shuf
@@ -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 && shuf --version
+print_ver_ shuf
 
 seq 100 > in || framework_failure
 
diff --git a/tests/misc/sort-benchmark-random b/tests/misc/sort-benchmark-random
index 135534454..89fbc18f4 100755
--- a/tests/misc/sort-benchmark-random
+++ b/tests/misc/sort-benchmark-random
@@ -19,7 +19,7 @@
 # Written by Glen Lenker.
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && sort --version
+print_ver_ sort
 
 very_expensive_
 
diff --git a/tests/misc/sort-compress b/tests/misc/sort-compress
index bba07604d..6692d0b61 100755
--- a/tests/misc/sort-compress
+++ b/tests/misc/sort-compress
@@ -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 && sort --version
+print_ver_ sort
 
 seq -w 2000 > exp || framework_failure
 tac exp > in || framework_failure
diff --git a/tests/misc/sort-continue b/tests/misc/sort-continue
index e4b8adfb3..95f2c488e 100755
--- a/tests/misc/sort-continue
+++ b/tests/misc/sort-continue
@@ -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 && sort --version
+print_ver_ sort
 
 # Skip the test when running under valgrind.
 ( ulimit -n 6; sort < /dev/null ) \
diff --git a/tests/misc/sort-debug-keys b/tests/misc/sort-debug-keys
index ee65a7284..98710c1e7 100755
--- a/tests/misc/sort-debug-keys
+++ b/tests/misc/sort-debug-keys
@@ -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 && sort --version
+print_ver_ sort
 
 number() { cat -n | sed 's/^ *//'; }
 
diff --git a/tests/misc/sort-debug-warn b/tests/misc/sort-debug-warn
index 67668a135..40b8168da 100755
--- a/tests/misc/sort-debug-warn
+++ b/tests/misc/sort-debug-warn
@@ -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 && sort --version
+print_ver_ sort
 
 cat <<\EOF > exp
 sort: using simple byte comparison
diff --git a/tests/misc/sort-float b/tests/misc/sort-float
index bd6a9b88b..b818a936b 100755
--- a/tests/misc/sort-float
+++ b/tests/misc/sort-float
@@ -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 && sort --version
+print_ver_ sort
 
 # Return 0 if LDBL_MIN is smaller than DBL_MIN, else 1.
 # Dissect numbers like these, comparing first exponent, then
diff --git a/tests/misc/sort-merge-fdlimit b/tests/misc/sort-merge-fdlimit
index 89a408490..1ed50952f 100755
--- a/tests/misc/sort-merge-fdlimit
+++ b/tests/misc/sort-merge-fdlimit
@@ -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 && sort --version
+print_ver_ sort
 require_ulimit_
 
 mkdir in err || framework_failure
diff --git a/tests/misc/sort-month b/tests/misc/sort-month
index c0fb2eb91..c241b5c8a 100755
--- a/tests/misc/sort-month
+++ b/tests/misc/sort-month
@@ -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 && sort --version
+print_ver_ sort
 
 locale --version >/dev/null 2>&1 ||
   skip_test_ 'The locale utility is not present'
diff --git a/tests/misc/sort-rand b/tests/misc/sort-rand
index 07169e3c6..8fa3bc366 100755
--- a/tests/misc/sort-rand
+++ b/tests/misc/sort-rand
@@ -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 && sort --version
+print_ver_ sort
 
 seq 100 > in || framework_failure
 
diff --git a/tests/misc/sort-unique b/tests/misc/sort-unique
index e659febd0..c58b8a2ff 100755
--- a/tests/misc/sort-unique
+++ b/tests/misc/sort-unique
@@ -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 && sort --version
+print_ver_ sort
 
 cat > in <<\EOF
 1
diff --git a/tests/misc/sort-version b/tests/misc/sort-version
index e6a07c27b..1e7c51383 100755
--- a/tests/misc/sort-version
+++ b/tests/misc/sort-version
@@ -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 && sort --version
+print_ver_ sort
 
 cat > in << _EOF_
 gcc-c++-10.fc9.tar.gz
diff --git a/tests/misc/split-a b/tests/misc/split-a
index 27269e2db..d861b9291 100755
--- a/tests/misc/split-a
+++ b/tests/misc/split-a
@@ -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 && split --version
+print_ver_ split
 
 a_z='a b c d e f g h i j k l m n o p q r s t u v w x y z'
 
diff --git a/tests/misc/split-fail b/tests/misc/split-fail
index ec1941691..b0b22e4c4 100755
--- a/tests/misc/split-fail
+++ b/tests/misc/split-fail
@@ -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 && split --version
+print_ver_ split
 getlimits_
 
 touch in || framework_failure
diff --git a/tests/misc/split-l b/tests/misc/split-l
index 2e64a2c93..8967439e8 100755
--- a/tests/misc/split-l
+++ b/tests/misc/split-l
@@ -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 && ln --version
+print_ver_ ln
 
 printf '1\n2\n3\n4\n5\n' > in || framework_failure
 
diff --git a/tests/misc/stat-birthtime b/tests/misc/stat-birthtime
index e584df02a..3c8478706 100755
--- a/tests/misc/stat-birthtime
+++ b/tests/misc/stat-birthtime
@@ -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 && stat --version
+print_ver_ stat
 
 # Whether birthtime is supported or not, it better not change even when
 # [acm]time are modified.  :)
diff --git a/tests/misc/stat-fmt b/tests/misc/stat-fmt
index 5e58ea46a..b297dcff5 100755
--- a/tests/misc/stat-fmt
+++ b/tests/misc/stat-fmt
@@ -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 && stat --version
+print_ver_ stat
 
 
 
diff --git a/tests/misc/stat-hyphen b/tests/misc/stat-hyphen
index 2e0fdd29a..19cbe7a67 100755
--- a/tests/misc/stat-hyphen
+++ b/tests/misc/stat-hyphen
@@ -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 && stat --version
+print_ver_ stat
 
 printf -- '-\n' > exp || framework_failure
 touch f || framework_failure
diff --git a/tests/misc/stat-mount b/tests/misc/stat-mount
index 039ce5040..c83e1b4b0 100755
--- a/tests/misc/stat-mount
+++ b/tests/misc/stat-mount
@@ -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 && stat --version
+print_ver_ stat
 
 df_mnt=$(df -P . | sed -n '2s/.* \([^ ]*$\)/\1/p')
 stat_mnt=$(stat -c%m .) || fail=1
diff --git a/tests/misc/stat-nanoseconds b/tests/misc/stat-nanoseconds
index cd2159644..de9030c81 100755
--- a/tests/misc/stat-nanoseconds
+++ b/tests/misc/stat-nanoseconds
@@ -16,7 +16,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-test "$VERBOSE" = yes && stat --version
+print_ver_ stat
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
 
 # Set this to avoid problems with weird time zones.
diff --git a/tests/misc/stat-slash b/tests/misc/stat-slash
index 4f0660f22..016fcb13a 100755
--- a/tests/misc/stat-slash
+++ b/tests/misc/stat-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 && stat --version
+print_ver_ stat
 
 touch file || framework_failure
 mkdir dir || framework_failure
diff --git a/tests/misc/stty b/tests/misc/stty
index cc1d933a3..6edab5c67 100755
--- a/tests/misc/stty
+++ b/tests/misc/stty
@@ -18,7 +18,7 @@
 
 # Make sure there's a tty on stdin.
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && stty --version
+print_ver_ stty
 
 require_controlling_input_terminal_
 trap '' TTOU # Ignore SIGTTOU
diff --git a/tests/misc/stty-invalid b/tests/misc/stty-invalid
index d80e3d413..b15d855ff 100755
--- a/tests/misc/stty-invalid
+++ b/tests/misc/stty-invalid
@@ -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 && stty --version
+print_ver_ stty
 require_controlling_input_terminal_
 trap '' TTOU # Ignore SIGTTOU
 
diff --git a/tests/misc/stty-row-col b/tests/misc/stty-row-col
index ed7fede97..152033448 100755
--- a/tests/misc/stty-row-col
+++ b/tests/misc/stty-row-col
@@ -29,7 +29,7 @@ LC_ALL=C
 export LC_ALL
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && stty --version
+print_ver_ stty
 
 require_controlling_input_terminal_
 trap '' TTOU # Ignore SIGTTOU
diff --git a/tests/misc/su-fail b/tests/misc/su-fail
index e8a0c5ff5..4e488806c 100755
--- a/tests/misc/su-fail
+++ b/tests/misc/su-fail
@@ -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 && su --version
+print_ver_ su
 
 require_built_ su
 
diff --git a/tests/misc/sum-sysv b/tests/misc/sum-sysv
index 5465f213a..e8e31fd24 100755
--- a/tests/misc/sum-sysv
+++ b/tests/misc/sum-sysv
@@ -26,7 +26,7 @@ LC_ALL=C
 export LC_ALL
 
 . "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && sum --version
+print_ver_ sum
 
 # FYI, 16843009 is floor (2^32 / 255).
 
diff --git a/tests/misc/tac-continue b/tests/misc/tac-continue
index 59dddc83e..b13cb5cf1 100755
--- a/tests/misc/tac-continue
+++ b/tests/misc/tac-continue
@@ -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 && tac --version
+print_ver_ tac
 
 # See if the envvar is defined.
 if test x = "x$FULL_PARTITION_TMPDIR"; then
diff --git a/tests/misc/tee b/tests/misc/tee
index 9562966ae..34dae0972 100755
--- a/tests/misc/tee
+++ b/tests/misc/tee
@@ -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 && tee --version
+print_ver_ tee
 
 echo line >sample || framework_failure
 nums=`seq 9` || framework_failure
diff --git a/tests/misc/tee-dash b/tests/misc/tee-dash
index e72eadeef..bc85e0157 100755
--- a/tests/misc/tee-dash
+++ b/tests/misc/tee-dash
@@ -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 && tee --version
+print_ver_ tee
 
 tee - </dev/null || fail=1
 
diff --git a/tests/misc/timeout b/tests/misc/timeout
index 8c9202613..7905f6676 100755
--- a/tests/misc/timeout
+++ b/tests/misc/timeout
@@ -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 && timeout --version
+print_ver_ timeout
 
 # no timeout
 timeout 10 true || fail=1
diff --git a/tests/misc/timeout-parameters b/tests/misc/timeout-parameters
index c5949e62b..37a34ddf4 100755
--- a/tests/misc/timeout-parameters
+++ b/tests/misc/timeout-parameters
@@ -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 && timeout --version
+print_ver_ timeout
 getlimits_
 
 
diff --git a/tests/misc/tr-case-class b/tests/misc/tr-case-class
index 14c6b0ea0..0c2acc606 100755
--- a/tests/misc/tr-case-class
+++ b/tests/misc/tr-case-class
@@ -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 && tr --version
+print_ver_ tr
 
 # Ensure we support translation of case classes with extension
 echo '01234567899999999999999999' > exp
diff --git a/tests/misc/truncate-dangling-symlink b/tests/misc/truncate-dangling-symlink
index 801b55d17..83c88e1d5 100755
--- a/tests/misc/truncate-dangling-symlink
+++ b/tests/misc/truncate-dangling-symlink
@@ -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 && truncate --version
+print_ver_ truncate
 
 ln -s truncate-target t-symlink
 
diff --git a/tests/misc/truncate-dir-fail b/tests/misc/truncate-dir-fail
index cc94dc4bc..c10e959b1 100755
--- a/tests/misc/truncate-dir-fail
+++ b/tests/misc/truncate-dir-fail
@@ -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 && truncate --version
+print_ver_ truncate
 
 # truncate on dir not allowed
 truncate -s+0 . && fail=1
diff --git a/tests/misc/truncate-fail-diag b/tests/misc/truncate-fail-diag
index 68a384236..d6c3b3bca 100755
--- a/tests/misc/truncate-fail-diag
+++ b/tests/misc/truncate-fail-diag
@@ -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 && truncate --version
+print_ver_ truncate
 skip_if_root_
 
 
diff --git a/tests/misc/truncate-fifo b/tests/misc/truncate-fifo
index 469ba5e97..0c732a7a2 100755
--- a/tests/misc/truncate-fifo
+++ b/tests/misc/truncate-fifo
@@ -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 && truncate --version
+print_ver_ truncate
 
 mkfifo_or_skip_ fifo
 
diff --git a/tests/misc/truncate-no-create-missing b/tests/misc/truncate-no-create-missing
index c5a87c2d0..a84b0d55c 100755
--- a/tests/misc/truncate-no-create-missing
+++ b/tests/misc/truncate-no-create-missing
@@ -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 && truncate --version
+print_ver_ truncate
 
 
 # truncate -c no-such-file should not fail.
diff --git a/tests/misc/truncate-overflow b/tests/misc/truncate-overflow
index 991c1c83f..a5c67501e 100755
--- a/tests/misc/truncate-overflow
+++ b/tests/misc/truncate-overflow
@@ -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 && truncate --version
+print_ver_ truncate
 getlimits_
 
 
diff --git a/tests/misc/truncate-owned-by-other b/tests/misc/truncate-owned-by-other
index 88aa63cbe..9ad4d6a17 100755
--- a/tests/misc/truncate-owned-by-other
+++ b/tests/misc/truncate-owned-by-other
@@ -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 && truncate --version
+print_ver_ truncate
 
 require_root_
 
diff --git a/tests/misc/truncate-parameters b/tests/misc/truncate-parameters
index 980ebffab..858c9d3fe 100755
--- a/tests/misc/truncate-parameters
+++ b/tests/misc/truncate-parameters
@@ -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 && truncate --version
+print_ver_ truncate
 
 
 # must specify at least 1 file
diff --git a/tests/misc/truncate-relative b/tests/misc/truncate-relative
index a82fd9c32..5e57264db 100755
--- a/tests/misc/truncate-relative
+++ b/tests/misc/truncate-relative
@@ -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 && truncate --version
+print_ver_ truncate
 
 
 # mixture of relative modifiers not allowed
diff --git a/tests/misc/wc-files0 b/tests/misc/wc-files0
index 7d3634e95..5eaccc947 100755
--- a/tests/misc/wc-files0
+++ b/tests/misc/wc-files0
@@ -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 && wc --version
+print_ver_ wc
 
 echo 2 > 2b || framework_failure
 echo 2 words > 2w || framework_failure
diff --git a/tests/misc/wc-parallel b/tests/misc/wc-parallel
index fd809f5f2..159da943c 100755
--- a/tests/misc/wc-parallel
+++ b/tests/misc/wc-parallel
@@ -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 && md5sum --version
+print_ver_ md5sum
 
 (mkdir tmp && cd tmp && seq 2000 | xargs touch)