[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[coreutils] [PATCH 1/5] tests: factor out VERBOSE-only --version-printin
|
From: |
Jim Meyering |
|
Subject: |
[coreutils] [PATCH 1/5] tests: factor out VERBOSE-only --version-printing code |
|
Date: |
Wed, 17 Nov 2010 22:31:13 +0100 |
FYI, here are 5 change-sets to make a few hundred (mostly automated)
changes like these:
-test "$VERBOSE" = yes && chown --version
+print_ver_ chown
-test "$VERBOSE" = yes && { cp --version; mv --version; }
+print_ver_ cp mv
-test "$VERBOSE" = yes && { env -- pwd --version; readlink --version; }
+print_ver_ pwd readlink
>From 5c0275e95353742854da6b915fed4fd0434d8159 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 16 Nov 2010 08:05:11 +0100
Subject: [PATCH 1/5] tests: factor out VERBOSE-only --version-printing code
* tests/init.cfg (print_ver_): New function.
---
tests/init.cfg | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/tests/init.cfg b/tests/init.cfg
index 97dad17..2270c0d 100644
--- a/tests/init.cfg
+++ b/tests/init.cfg
@@ -399,4 +399,16 @@ retry_delay_()
test "$time_fail" = 0
}
+# Call this with a list of programs under test immediately after
+# sourcing init.sh.
+print_ver_()
+{
+ if test "$VERBOSE" = yes; then
+ local i
+ for i in $*; do
+ env $i --version
+ done
+ fi
+}
+
sanitize_path_
--
1.7.3.2.4.g60aa9
>From 293c37b9061c1afd0acd143bbded637a8f00b3a0 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 17 Nov 2010 21:35:31 +0100
Subject: [PATCH 2/5] 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/'
---
tests/chgrp/basic | 2 +-
tests/chgrp/default-no-deref | 2 +-
tests/chgrp/deref | 2 +-
tests/chgrp/no-x | 2 +-
tests/chgrp/posix-H | 2 +-
tests/chgrp/recurse | 2 +-
tests/chmod/c-option | 2 +-
tests/chmod/equal-x | 2 +-
tests/chmod/equals | 2 +-
tests/chmod/inaccessible | 2 +-
tests/chmod/no-x | 2 +-
tests/chmod/octal | 2 +-
tests/chmod/setgid | 2 +-
tests/chmod/thru-dangling | 2 +-
tests/chmod/umask-x | 2 +-
tests/chmod/usage | 2 +-
tests/chown/basic | 2 +-
tests/chown/deref | 2 +-
tests/chown/preserve-root | 2 +-
tests/chown/separator | 2 +-
tests/cp/abuse | 2 +-
tests/cp/backup-1 | 2 +-
tests/cp/backup-dir | 2 +-
tests/cp/backup-is-src | 2 +-
tests/cp/capability | 2 +-
tests/cp/cp-HL | 2 +-
tests/cp/cp-a-selinux | 2 +-
tests/cp/cp-deref | 2 +-
tests/cp/cp-i | 2 +-
tests/cp/cp-mv-backup | 2 +-
tests/cp/cp-parents | 2 +-
tests/cp/deref-slink | 2 +-
tests/cp/dir-rm-dest | 2 +-
tests/cp/dir-slash | 2 +-
tests/cp/dir-vs-file | 2 +-
tests/cp/existing-perm-race | 2 +-
tests/cp/fail-perm | 2 +-
tests/cp/file-perm-race | 2 +-
tests/cp/into-self | 2 +-
tests/cp/link | 2 +-
tests/cp/link-heap | 2 +-
tests/cp/link-no-deref | 2 +-
tests/cp/link-preserve | 2 +-
tests/cp/no-deref-link1 | 2 +-
tests/cp/no-deref-link2 | 2 +-
tests/cp/no-deref-link3 | 2 +-
tests/cp/parent-perm | 2 +-
tests/cp/parent-perm-race | 2 +-
tests/cp/preserve-2 | 2 +-
tests/cp/preserve-gid | 2 +-
tests/cp/preserve-slink-time | 2 +-
tests/cp/proc-short-read | 2 +-
tests/cp/proc-zero-len | 2 +-
tests/cp/r-vs-symlink | 2 +-
tests/cp/reflink-auto | 2 +-
tests/cp/reflink-perm | 2 +-
tests/cp/same-file | 2 +-
tests/cp/slink-2-slink | 2 +-
tests/cp/sparse | 2 +-
tests/cp/special-bits | 2 +-
tests/cp/special-f | 2 +-
tests/cp/src-base-dot | 2 +-
tests/cp/symlink-slash | 2 +-
tests/cp/thru-dangling | 2 +-
tests/dd/direct | 2 +-
tests/dd/misc | 2 +-
tests/dd/not-rewound | 2 +-
tests/dd/reblock | 2 +-
tests/dd/skip-seek-past-dev | 2 +-
tests/dd/skip-seek-past-file | 2 +-
tests/dd/skip-seek2 | 2 +-
tests/dd/stderr | 2 +-
tests/dd/unblock-sync | 2 +-
tests/df/total-verify | 2 +-
tests/df/unreadable | 2 +-
tests/du/2g | 2 +-
tests/du/8gb | 2 +-
tests/du/basic | 2 +-
tests/du/deref | 2 +-
tests/du/deref-args | 2 +-
tests/du/exclude | 2 +-
tests/du/fd-leak | 2 +-
tests/du/hard-link | 2 +-
tests/du/inacc-dest | 2 +-
tests/du/inacc-dir | 2 +-
tests/du/inaccessible-cwd | 2 +-
tests/du/long-from-unreadable | 2 +-
tests/du/long-sloop | 2 +-
tests/du/no-deref | 2 +-
tests/du/no-x | 2 +-
tests/du/one-file-system | 2 +-
tests/du/restore-wd | 2 +-
tests/du/slash | 2 +-
tests/du/slink | 2 +-
tests/du/trailing-slash | 2 +-
tests/du/two-args | 2 +-
tests/id/no-context | 2 +-
tests/install/basic-1 | 2 +-
tests/install/create-leading | 2 +-
tests/install/d-slashdot | 2 +-
tests/install/install-C | 2 +-
tests/install/install-C-root | 2 +-
tests/install/install-C-selinux | 2 +-
tests/install/strip-program | 2 +-
tests/install/trap | 2 +-
tests/ln/backup-1 | 2 +-
tests/ln/hard-backup | 2 +-
tests/ln/hard-to-sym | 2 +-
tests/ln/misc | 2 +-
tests/ln/sf-1 | 2 +-
tests/ln/slash-decorated-nonexistent-dest | 2 +-
tests/ln/target-1 | 2 +-
tests/ls/abmon-align | 2 +-
tests/ls/capability | 2 +-
tests/ls/color-clear-to-eol | 2 +-
tests/ls/color-dtype-dir | 2 +-
tests/ls/color-norm | 2 +-
tests/ls/dangle | 2 +-
tests/ls/dired | 2 +-
tests/ls/file-type | 2 +-
tests/ls/follow-slink | 2 +-
tests/ls/infloop | 2 +-
tests/ls/inode | 2 +-
tests/ls/m-option | 2 +-
tests/ls/multihardlink | 2 +-
tests/ls/nameless-uid | 2 +-
tests/ls/no-arg | 2 +-
tests/ls/no-cap | 2 +-
tests/ls/proc-selinux-segfault | 2 +-
tests/ls/readdir-mountpoint-inode | 2 +-
tests/ls/recursive | 2 +-
tests/ls/stat-dtype | 2 +-
tests/ls/stat-failed | 2 +-
tests/ls/stat-free-symlinks | 2 +-
tests/ls/stat-vs-dirent | 2 +-
tests/ls/symlink-slash | 2 +-
tests/ls/x-option | 2 +-
tests/misc/arch | 2 +-
tests/misc/cat-buf | 2 +-
tests/misc/cat-proc | 2 +-
tests/misc/chcon | 2 +-
tests/misc/chcon-fail | 2 +-
tests/misc/chroot-credentials | 2 +-
tests/misc/chroot-fail | 2 +-
tests/misc/close-stdout | 2 +-
tests/misc/csplit | 2 +-
tests/misc/csplit-1000 | 2 +-
tests/misc/csplit-heap | 2 +-
tests/misc/date-sec | 2 +-
tests/misc/df | 2 +-
tests/misc/df-P | 2 +-
tests/misc/env | 2 +-
tests/misc/false-status | 2 +-
tests/misc/fmt-long-line | 2 +-
tests/misc/groups-dash | 2 +-
tests/misc/groups-version | 2 +-
tests/misc/head-c | 2 +-
tests/misc/head-pos | 2 +-
tests/misc/id-context | 2 +-
tests/misc/id-groups | 2 +-
tests/misc/ls-time | 2 +-
tests/misc/md5sum-parallel | 2 +-
tests/misc/mknod | 2 +-
tests/misc/nice | 2 +-
tests/misc/nice-fail | 2 +-
tests/misc/nl | 2 +-
tests/misc/nohup | 2 +-
tests/misc/nproc-avail | 2 +-
tests/misc/nproc-positive | 2 +-
tests/misc/od-N | 2 +-
tests/misc/od-multiple-t | 2 +-
tests/misc/od-x8 | 2 +-
tests/misc/pathchk1 | 2 +-
tests/misc/ptx-overrun | 2 +-
tests/misc/readlink-fp-loop | 2 +-
tests/misc/runcon-no-reorder | 2 +-
tests/misc/seq-long-double | 2 +-
tests/misc/shred-exact | 2 +-
tests/misc/shred-passes | 2 +-
tests/misc/shred-remove | 2 +-
tests/misc/shuf | 2 +-
tests/misc/sort-benchmark-random | 2 +-
tests/misc/sort-compress | 2 +-
tests/misc/sort-continue | 2 +-
tests/misc/sort-debug-keys | 2 +-
tests/misc/sort-debug-warn | 2 +-
tests/misc/sort-float | 2 +-
tests/misc/sort-merge-fdlimit | 2 +-
tests/misc/sort-month | 2 +-
tests/misc/sort-rand | 2 +-
tests/misc/sort-unique | 2 +-
tests/misc/sort-version | 2 +-
tests/misc/split-a | 2 +-
tests/misc/split-fail | 2 +-
tests/misc/split-l | 2 +-
tests/misc/stat-birthtime | 2 +-
tests/misc/stat-fmt | 2 +-
tests/misc/stat-hyphen | 2 +-
tests/misc/stat-mount | 2 +-
tests/misc/stat-nanoseconds | 2 +-
tests/misc/stat-slash | 2 +-
tests/misc/stty | 2 +-
tests/misc/stty-invalid | 2 +-
tests/misc/stty-row-col | 2 +-
tests/misc/su-fail | 2 +-
tests/misc/sum-sysv | 2 +-
tests/misc/tac-continue | 2 +-
tests/misc/tee | 2 +-
tests/misc/tee-dash | 2 +-
tests/misc/timeout | 2 +-
tests/misc/timeout-parameters | 2 +-
tests/misc/tr-case-class | 2 +-
tests/misc/truncate-dangling-symlink | 2 +-
tests/misc/truncate-dir-fail | 2 +-
tests/misc/truncate-fail-diag | 2 +-
tests/misc/truncate-fifo | 2 +-
tests/misc/truncate-no-create-missing | 2 +-
tests/misc/truncate-overflow | 2 +-
tests/misc/truncate-owned-by-other | 2 +-
tests/misc/truncate-parameters | 2 +-
tests/misc/truncate-relative | 2 +-
tests/misc/wc-files0 | 2 +-
tests/misc/wc-parallel | 2 +-
tests/mkdir/p-1 | 2 +-
tests/mkdir/p-2 | 2 +-
tests/mkdir/p-3 | 2 +-
tests/mkdir/p-slashdot | 2 +-
tests/mkdir/p-thru-slink | 2 +-
tests/mkdir/p-v | 2 +-
tests/mkdir/parents | 2 +-
tests/mkdir/perm | 2 +-
tests/mkdir/special-1 | 2 +-
tests/mkdir/t-slash | 2 +-
tests/mkdir/writable-under-readonly | 2 +-
tests/mv/atomic | 2 +-
tests/mv/atomic2 | 2 +-
tests/mv/backup-dir | 2 +-
tests/mv/backup-is-src | 2 +-
tests/mv/diag | 2 +-
tests/mv/dir-file | 2 +-
tests/mv/dir2dir | 2 +-
tests/mv/force | 2 +-
tests/mv/hard-3 | 2 +-
tests/mv/hard-4 | 2 +-
tests/mv/hard-link-1 | 2 +-
tests/mv/hard-verbose | 2 +-
tests/mv/i-3 | 2 +-
tests/mv/i-4 | 2 +-
tests/mv/i-5 | 2 +-
tests/mv/i-link-no | 2 +-
tests/mv/into-self | 2 +-
tests/mv/into-self-2 | 2 +-
tests/mv/into-self-3 | 2 +-
tests/mv/into-self-4 | 2 +-
tests/mv/leak-fd | 2 +-
tests/mv/mv-n | 2 +-
tests/mv/mv-special-1 | 2 +-
tests/mv/no-target-dir | 2 +-
tests/mv/part-fail | 2 +-
tests/mv/part-hardlink | 2 +-
tests/mv/part-rename | 2 +-
tests/mv/partition-perm | 2 +-
tests/mv/perm-1 | 2 +-
tests/mv/sticky-to-xpart | 2 +-
tests/mv/to-symlink | 2 +-
tests/mv/trailing-slash | 2 +-
tests/readlink/can-e | 2 +-
tests/readlink/can-f | 2 +-
tests/readlink/can-m | 2 +-
tests/readlink/rl-1 | 2 +-
tests/rm/cycle | 2 +-
tests/rm/dangling-symlink | 2 +-
tests/rm/deep-1 | 2 +-
tests/rm/deep-2 | 2 +-
tests/rm/dir-no-w | 2 +-
tests/rm/dir-nonrecur | 2 +-
tests/rm/dot-rel | 2 +-
tests/rm/empty-inacc | 2 +-
tests/rm/ext3-perf | 2 +-
tests/rm/f-1 | 2 +-
tests/rm/fail-2eperm | 2 +-
tests/rm/fail-eacces | 2 +-
tests/rm/hash | 2 +-
tests/rm/i-1 | 2 +-
tests/rm/i-never | 2 +-
tests/rm/i-no-r | 2 +-
tests/rm/ignorable | 2 +-
tests/rm/inaccessible | 2 +-
tests/rm/interactive-always | 2 +-
tests/rm/interactive-once | 2 +-
tests/rm/ir-1 | 2 +-
tests/rm/isatty | 2 +-
tests/rm/no-give-up | 2 +-
tests/rm/one-file-system | 2 +-
tests/rm/one-file-system2 | 2 +-
tests/rm/r-1 | 2 +-
tests/rm/r-2 | 2 +-
tests/rm/r-3 | 2 +-
tests/rm/r-4 | 2 +-
tests/rm/read-only | 2 +-
tests/rm/readdir-bug | 2 +-
tests/rm/rm1 | 2 +-
tests/rm/rm2 | 2 +-
tests/rm/rm3 | 2 +-
tests/rm/rm4 | 2 +-
tests/rm/rm5 | 2 +-
tests/rm/sunos-1 | 2 +-
tests/rm/unread2 | 2 +-
tests/rm/unread3 | 2 +-
tests/rm/v-slash | 2 +-
tests/rmdir/fail-perm | 2 +-
tests/rmdir/ignore | 2 +-
tests/rmdir/t-slash | 2 +-
tests/sample-test | 2 +-
tests/tail-2/F-vs-missing | 2 +-
tests/tail-2/F-vs-rename | 2 +-
tests/tail-2/append-only | 2 +-
tests/tail-2/assert | 2 +-
tests/tail-2/assert-2 | 2 +-
tests/tail-2/big-4gb | 2 +-
tests/tail-2/flush-initial | 2 +-
tests/tail-2/follow-stdin | 2 +-
tests/tail-2/infloop-1 | 2 +-
tests/tail-2/inotify-hash-abuse | 2 +-
tests/tail-2/inotify-hash-abuse2 | 2 +-
tests/tail-2/inotify-race | 2 +-
tests/tail-2/pid | 2 +-
tests/tail-2/pipe-f | 2 +-
tests/tail-2/pipe-f2 | 2 +-
tests/tail-2/proc-ksyms | 2 +-
tests/tail-2/start-middle | 2 +-
tests/tail-2/tail-n0f | 2 +-
tests/tail-2/wait | 2 +-
tests/touch/60-seconds | 2 +-
tests/touch/dangling-symlink | 2 +-
tests/touch/dir-1 | 2 +-
tests/touch/empty-file | 2 +-
tests/touch/fail-diag | 2 +-
tests/touch/fifo | 2 +-
tests/touch/no-create-missing | 2 +-
tests/touch/no-dereference | 2 +-
tests/touch/no-rights | 2 +-
tests/touch/not-owner | 2 +-
tests/touch/now-owned-by-other | 2 +-
tests/touch/obsolescent | 2 +-
tests/touch/read-only | 2 +-
tests/touch/relative | 2 +-
tests/touch/trailing-slash | 2 +-
348 files changed, 348 insertions(+), 348 deletions(-)
diff --git a/tests/chgrp/basic b/tests/chgrp/basic
index 7d67166..91b111f 100755
--- a/tests/chgrp/basic
+++ b/tests/chgrp/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 && chgrp --version
+print_ver_ chgrp
require_membership_in_two_groups_
diff --git a/tests/chgrp/default-no-deref b/tests/chgrp/default-no-deref
index 77d3bcb..0b380ac 100755
--- a/tests/chgrp/default-no-deref
+++ b/tests/chgrp/default-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 && chgrp --version
+print_ver_ chgrp
require_membership_in_two_groups_
set _ $groups; shift
diff --git a/tests/chgrp/deref b/tests/chgrp/deref
index e3cfed2..d470fe1 100755
--- a/tests/chgrp/deref
+++ b/tests/chgrp/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 && chgrp --version
+print_ver_ chgrp
require_membership_in_two_groups_
set _ $groups; shift
diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x
index e3a4aef..d309bd7 100755
--- a/tests/chgrp/no-x
+++ b/tests/chgrp/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 && chgrp --version
+print_ver_ chgrp
require_membership_in_two_groups_
skip_if_root_
diff --git a/tests/chgrp/posix-H b/tests/chgrp/posix-H
index 6cf101c..c5aeb4b 100755
--- a/tests/chgrp/posix-H
+++ b/tests/chgrp/posix-H
@@ -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 && chgrp --version
+print_ver_ chgrp
require_membership_in_two_groups_
set _ $groups; shift
diff --git a/tests/chgrp/recurse b/tests/chgrp/recurse
index 0f7f00f..9f92fdb 100755
--- a/tests/chgrp/recurse
+++ b/tests/chgrp/recurse
@@ -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 && chgrp --version
+print_ver_ chgrp
require_membership_in_two_groups_
set _ $groups; shift
diff --git a/tests/chmod/c-option b/tests/chmod/c-option
index 4db905f..440702f 100755
--- a/tests/chmod/c-option
+++ b/tests/chmod/c-option
@@ -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 && chmod --version
+print_ver_ chmod
umask 0
file=f
diff --git a/tests/chmod/equal-x b/tests/chmod/equal-x
index 32226f1..bb9e4b2 100755
--- a/tests/chmod/equal-x
+++ b/tests/chmod/equal-x
@@ -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 && chmod --version
+print_ver_ chmod
file=f
touch $file || framework_failure
diff --git a/tests/chmod/equals b/tests/chmod/equals
index 79e01fb..8dd9d52 100755
--- a/tests/chmod/equals
+++ b/tests/chmod/equals
@@ -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 && chmod --version
+print_ver_ chmod
touch f || framework_failure
diff --git a/tests/chmod/inaccessible b/tests/chmod/inaccessible
index 37dc8ff..b88fa55 100755
--- a/tests/chmod/inaccessible
+++ b/tests/chmod/inaccessible
@@ -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 && chmod --version
+print_ver_ chmod
mkdir -p d/e || framework_failure
chmod 0 d/e d || framework_failure
diff --git a/tests/chmod/no-x b/tests/chmod/no-x
index 464a254..b6dfea1 100755
--- a/tests/chmod/no-x
+++ b/tests/chmod/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 && chmod --version
+print_ver_ chmod
skip_if_root_
mkdir -p d/no-x/y a/b || framework_failure
diff --git a/tests/chmod/octal b/tests/chmod/octal
index add5777..6eec93c 100755
--- a/tests/chmod/octal
+++ b/tests/chmod/octal
@@ -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 && chmod --version
+print_ver_ chmod
# Before coreutils-5.92, this would mistakenly succeed,
diff --git a/tests/chmod/setgid b/tests/chmod/setgid
index 89e971c..7bfe4ed 100755
--- a/tests/chmod/setgid
+++ b/tests/chmod/setgid
@@ -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 && chmod --version
+print_ver_ chmod
umask 0
mkdir d || framework_failure
diff --git a/tests/chmod/thru-dangling b/tests/chmod/thru-dangling
index 8421a98..3fb4702 100755
--- a/tests/chmod/thru-dangling
+++ b/tests/chmod/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 && chmod --version
+print_ver_ chmod
ln -s non-existent dangle || framework_failure
diff --git a/tests/chmod/umask-x b/tests/chmod/umask-x
index e0c5e36..f11d53d 100755
--- a/tests/chmod/umask-x
+++ b/tests/chmod/umask-x
@@ -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 && chmod --version
+print_ver_ chmod
touch file
chmod 755 file
diff --git a/tests/chmod/usage b/tests/chmod/usage
index e2d33fc..e6f91c7 100755
--- a/tests/chmod/usage
+++ b/tests/chmod/usage
@@ -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 && chmod --version
+print_ver_ chmod
# Each line in this list is a set of arguments, followed by :,
diff --git a/tests/chown/basic b/tests/chown/basic
index 3ad43b4..59f3cb7 100755
--- a/tests/chown/basic
+++ b/tests/chown/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 && chgrp --version
+print_ver_ chgrp
require_root_
touch f || framework_failure
diff --git a/tests/chown/deref b/tests/chown/deref
index 85603b4..7ea8a09 100755
--- a/tests/chown/deref
+++ b/tests/chown/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 && chown --version
+print_ver_ chown
ln -s no-such dangle || framework_failure
diff --git a/tests/chown/preserve-root b/tests/chown/preserve-root
index c011496..f3cd267 100755
--- a/tests/chown/preserve-root
+++ b/tests/chown/preserve-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 && chown --version
+print_ver_ chown
skip_if_root_
mkdir d && ln -s / d/slink-to-root
diff --git a/tests/chown/separator b/tests/chown/separator
index 914d9cc..859ae9a 100755
--- a/tests/chown/separator
+++ b/tests/chown/separator
@@ -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 && chown --version
+print_ver_ chown
id_u=`id -u` || framework_failure
test -n "$id_u" || framework_failure
diff --git a/tests/cp/abuse b/tests/cp/abuse
index fb5e435..712737b 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 6908462..94c1f2a 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 c1718de..33298e6 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 8a8b480..301088c 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 3a241d0..c188284 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 f2a2dc4..cca2350 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 bfc7956..d5e744b 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 8315a62..36f9d09 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 8e86267..5902fc6 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 ad7bfa5..d775685 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 22100b5..5e8f2c9 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 a11bd0d..bf08321 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 2923a47..abddfe2 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 18050a3..156987f 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 4990141..ca8db2e 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 f1c7bc1..f048eb1 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 cd763f7..f6a77a1 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 6b3b604..140c7ee 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 3341d1a..5244a85 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 f0bd241..89d0602 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 f5ed6e6..2a0c048 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 d575ec8..794d3df 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 fe5ad42..c4f9774 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 f0d1a9e..6be72cf 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 2351589..0ccb911 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 1053b3e..d648f34 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 82dd913..62aa80b 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 b6374ae..fd39340 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 d7565df..5f3e0da 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 6fa5293..a25cbb4 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 5a61b7e..a2245f2 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 2bc2a61..3525d00 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 ca28fa4..397b91e 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 7d9dfd8..34d6a4e 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 7d61ed2..de24df9 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 a330584..6ae8ce4 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 97b5b29..873ac2d 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 69e0c95..4918a35 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 60e226b..9391a9a 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 f09e499..d468fe3 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 6c0b137..79875b2 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 73e4f6f..ff07bb9 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 dfc9b2b..a104dd6 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 592dda2..4d87d35 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
diff --git a/tests/dd/direct b/tests/dd/direct
index 1381ce6..8954dd8 100755
--- a/tests/dd/direct
+++ b/tests/dd/direct
@@ -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 && dd --version
+print_ver_ dd
truncate -s 8192 in || framework_failure
dd if=in oflag=direct of=out 2> /dev/null \
diff --git a/tests/dd/misc b/tests/dd/misc
index 92be450..54727a1 100755
--- a/tests/dd/misc
+++ b/tests/dd/misc
@@ -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 && dd --version
+print_ver_ dd
tmp_in=dd-in.$$
tmp_in2=dd-in2.$$
diff --git a/tests/dd/not-rewound b/tests/dd/not-rewound
index 75c08c9..deea889 100755
--- a/tests/dd/not-rewound
+++ b/tests/dd/not-rewound
@@ -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 && dd --version
+print_ver_ dd
echo abcde > in
diff --git a/tests/dd/reblock b/tests/dd/reblock
index c5d667c..f70ffed 100755
--- a/tests/dd/reblock
+++ b/tests/dd/reblock
@@ -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 && dd --version
+print_ver_ dd
# 2 short reads -> 1 full write + 1 partial write
cat <<\EOF > exp-reblock || framework_failure
diff --git a/tests/dd/skip-seek-past-dev b/tests/dd/skip-seek-past-dev
index 762671c..a49f1b3 100755
--- a/tests/dd/skip-seek-past-dev
+++ b/tests/dd/skip-seek-past-dev
@@ -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 && dd --version
+print_ver_ dd
# need write access to local device
# (even though we don't actually write anything)
diff --git a/tests/dd/skip-seek-past-file b/tests/dd/skip-seek-past-file
index 605e964..d8cd27a 100755
--- a/tests/dd/skip-seek-past-file
+++ b/tests/dd/skip-seek-past-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 && dd --version
+print_ver_ dd
require_sparse_support_ # for `truncate --size=$OFF_T_MAX`
eval $(getlimits) # for OFF_T limits
diff --git a/tests/dd/skip-seek2 b/tests/dd/skip-seek2
index 4897e10..a915f42 100755
--- a/tests/dd/skip-seek2
+++ b/tests/dd/skip-seek2
@@ -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 && dd --version
+print_ver_ dd
echo LA:3456789abcdef > in || fail=1
diff --git a/tests/dd/stderr b/tests/dd/stderr
index fd7b747..2b9e941 100755
--- a/tests/dd/stderr
+++ b/tests/dd/stderr
@@ -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 && dd --version
+print_ver_ dd
p=$abs_top_builddir
diff --git a/tests/dd/unblock-sync b/tests/dd/unblock-sync
index 2d8dc32..29a2032 100755
--- a/tests/dd/unblock-sync
+++ b/tests/dd/unblock-sync
@@ -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 && dd --version
+print_ver_ dd
printf 000100020003xx > in || framework_failure
diff --git a/tests/df/total-verify b/tests/df/total-verify
index abe85bc..fe17c05 100755
--- a/tests/df/total-verify
+++ b/tests/df/total-verify
@@ -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 || skip_test_ "df fails"
diff --git a/tests/df/unreadable b/tests/df/unreadable
index 5c98760..a54afe4 100755
--- a/tests/df/unreadable
+++ b/tests/df/unreadable
@@ -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
skip_if_root_
touch unreadable || fail=1
diff --git a/tests/du/2g b/tests/du/2g
index 0021fda..da3cc6a 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 f416111..ccfa674 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 b96d861..3d0f73e 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 0dbf485..17f5062 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 1743b04..49bfc47 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 d3295cf..06a489f 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 728ce05..a9f0086 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 68a7e22..576342f 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 2424281..482cb30 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 0be254c..78bdaf3 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 a1656b2..264a381 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 2b38e69..1da08bf 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 391174a..b3abd48 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 d56bc75..c3e8840 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 580b527..0cee47d9 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 bb4d7cb..7c02b41 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 bb2b165..a50a451 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 3434e3e..daf5d66 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 092ea12..1340c76 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 70549a8..a054a61 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 ed544b0..4c71f28 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
diff --git a/tests/id/no-context b/tests/id/no-context
index 90ff71e..8ae9aaf 100755
--- a/tests/id/no-context
+++ b/tests/id/no-context
@@ -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 && id --version
+print_ver_ id
# We don't need selinux *FS* support to test id,
# but this is as good a witness as any, in general.
diff --git a/tests/install/basic-1 b/tests/install/basic-1
index 6470f5d..5e07bab 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 acb92a9..3801030 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 b7cd17a..7c43703 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 ea6292c..d9204e8 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 a36aa1e..744c4c1 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 8818c73..d203a0b 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 71001d9..e54c2e1 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 3092e92..58bd5bc 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.
diff --git a/tests/ln/backup-1 b/tests/ln/backup-1
index f07ba94..17e9428 100755
--- a/tests/ln/backup-1
+++ b/tests/ln/backup-1
@@ -20,7 +20,7 @@
# Based on a problem report from Jamie Lokier.
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && ln --version
+print_ver_ ln
touch a b || framework_failure
diff --git a/tests/ln/hard-backup b/tests/ln/hard-backup
index 3b3f6ec..41af2d9 100755
--- a/tests/ln/hard-backup
+++ b/tests/ln/hard-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 && ln --version
+print_ver_ ln
touch f || framework_failure
diff --git a/tests/ln/hard-to-sym b/tests/ln/hard-to-sym
index a78b738..13d22fb 100755
--- a/tests/ln/hard-to-sym
+++ b/tests/ln/hard-to-sym
@@ -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
# ===================================================
diff --git a/tests/ln/misc b/tests/ln/misc
index de03890..994f42e 100755
--- a/tests/ln/misc
+++ b/tests/ln/misc
@@ -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
t=tln-symlink
d=tln-subdir
diff --git a/tests/ln/sf-1 b/tests/ln/sf-1
index 189abe5..4ba8f3d 100755
--- a/tests/ln/sf-1
+++ b/tests/ln/sf-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 && ln --version
+print_ver_ ln
echo foo > a || framework_failure
ln -s . b || framework_failure
diff --git a/tests/ln/slash-decorated-nonexistent-dest
b/tests/ln/slash-decorated-nonexistent-dest
index 1020da2..e07bb3d 100755
--- a/tests/ln/slash-decorated-nonexistent-dest
+++ b/tests/ln/slash-decorated-nonexistent-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 && ln --version
+print_ver_ ln
touch f || framework_failure
diff --git a/tests/ln/target-1 b/tests/ln/target-1
index 1f1ebc2..e5e86c0 100755
--- a/tests/ln/target-1
+++ b/tests/ln/target-1
@@ -22,7 +22,7 @@
# Based on a test case from Dmitry V. Levin.
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && ln --version
+print_ver_ ln
mkdir d || framework_failure
ln -s --target-dir=d ../f || fail=1
diff --git a/tests/ls/abmon-align b/tests/ls/abmon-align
index 21c22f4..8d27bdc 100755
--- a/tests/ls/abmon-align
+++ b/tests/ls/abmon-align
@@ -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
for mon in $(seq -w 12); do
touch -d"+$mon month" $mon.ts || framework_failure
diff --git a/tests/ls/capability b/tests/ls/capability
index 200060a..588ec6d 100755
--- a/tests/ls/capability
+++ b/tests/ls/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_
grep '^#define HAVE_CAP 1' $CONFIG_HEADER > /dev/null \
diff --git a/tests/ls/color-clear-to-eol b/tests/ls/color-clear-to-eol
index 683ee4e..383c164 100755
--- a/tests/ls/color-clear-to-eol
+++ b/tests/ls/color-clear-to-eol
@@ -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
long_name=zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.foo
touch $long_name || framework_failure
diff --git a/tests/ls/color-dtype-dir b/tests/ls/color-dtype-dir
index b691ae7..9521f0d 100755
--- a/tests/ls/color-dtype-dir
+++ b/tests/ls/color-dtype-dir
@@ -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 && ls --version
+print_ver_ ls
# Don't let a different umask perturb the results.
umask 22
diff --git a/tests/ls/color-norm b/tests/ls/color-norm
index 9d946a0..113bf6e 100755
--- a/tests/ls/color-norm
+++ b/tests/ls/color-norm
@@ -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 && ls --version
+print_ver_ ls
# Don't let a different umask perturb the results.
umask 22
diff --git a/tests/ls/dangle b/tests/ls/dangle
index f544df2..d34b8f3 100755
--- a/tests/ls/dangle
+++ b/tests/ls/dangle
@@ -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
ln -s no-such-file dangle || framework_failure
mkdir -p dir/sub || framework_failure
diff --git a/tests/ls/dired b/tests/ls/dired
index b59426d..c961cc9 100755
--- a/tests/ls/dired
+++ b/tests/ls/dired
@@ -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
mkdir dir || framework_failure
diff --git a/tests/ls/file-type b/tests/ls/file-type
index 07a8cd4..1dc68d7 100755
--- a/tests/ls/file-type
+++ b/tests/ls/file-type
@@ -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
mkdir sub
cd sub
diff --git a/tests/ls/follow-slink b/tests/ls/follow-slink
index 00e49ba..0c06ded 100755
--- a/tests/ls/follow-slink
+++ b/tests/ls/follow-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 && ls --version
+print_ver_ ls
# Isolate output files from directory being listed
mkdir dir dir/sub dir1 || framework_failure
diff --git a/tests/ls/infloop b/tests/ls/infloop
index be89efc..2491ded 100755
--- a/tests/ls/infloop
+++ b/tests/ls/infloop
@@ -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 && ls --version
+print_ver_ ls
mkdir loop || framework_failure
ln -s ../loop loop/sub || framework_failure
diff --git a/tests/ls/inode b/tests/ls/inode
index 08ae0f8..7072d46 100755
--- a/tests/ls/inode
+++ b/tests/ls/inode
@@ -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
touch f || framework_failure
ln -s f slink || framework_failure
diff --git a/tests/ls/m-option b/tests/ls/m-option
index b35e527..f40d3b0 100755
--- a/tests/ls/m-option
+++ b/tests/ls/m-option
@@ -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
seq 2000 > b || framework_failure
touch a || framework_failure
diff --git a/tests/ls/multihardlink b/tests/ls/multihardlink
index 46850e8..78f30a0 100755
--- a/tests/ls/multihardlink
+++ b/tests/ls/multihardlink
@@ -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
working_umask_or_skip_
touch file file1 || framework_failure
diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid
index 6b4f368..e54c7ae 100755
--- a/tests/ls/nameless-uid
+++ b/tests/ls/nameless-uid
@@ -20,7 +20,7 @@
. $srcdir/require-perl
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && ls --version
+print_ver_ ls
require_root_
diff --git a/tests/ls/no-arg b/tests/ls/no-arg
index 288688b..c86ac6a 100755
--- a/tests/ls/no-arg
+++ b/tests/ls/no-arg
@@ -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
mkdir -p dir/subdir || framework_failure
touch dir/subdir/file2 || framework_failure
diff --git a/tests/ls/no-cap b/tests/ls/no-cap
index c826202..47e7471 100755
--- a/tests/ls/no-cap
+++ b/tests/ls/no-cap
@@ -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_strace_ capget
strace -e capget ls --color=always > /dev/null 2> out || fail=1
diff --git a/tests/ls/proc-selinux-segfault b/tests/ls/proc-selinux-segfault
index f0dbb96..f7b9d96 100755
--- a/tests/ls/proc-selinux-segfault
+++ b/tests/ls/proc-selinux-segfault
@@ -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
f=/proc/sys
test -r $f || f=.
diff --git a/tests/ls/readdir-mountpoint-inode
b/tests/ls/readdir-mountpoint-inode
index 9a38627..8c17eb4 100755
--- a/tests/ls/readdir-mountpoint-inode
+++ b/tests/ls/readdir-mountpoint-inode
@@ -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
# We use --local here so as to not activate
# potentially very many remote mounts.
diff --git a/tests/ls/recursive b/tests/ls/recursive
index a216249..06cfcbb 100755
--- a/tests/ls/recursive
+++ b/tests/ls/recursive
@@ -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 && ls --version
+print_ver_ ls
mkdir x y a b c a/1 a/2 a/3 || framework_failure
touch f a/1/I a/1/II || framework_failure
diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype
index bfc51aa..ad30920 100755
--- a/tests/ls/stat-dtype
+++ b/tests/ls/stat-dtype
@@ -22,7 +22,7 @@
# can report its type nonetheless, using dirent.d_type.
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && ls --version
+print_ver_ ls
# Skip this test unless "." is on a file system with useful d_type info.
# FIXME: This uses "ls -p" to decide whether to test "ls" with other options,
diff --git a/tests/ls/stat-failed b/tests/ls/stat-failed
index e7feba5..8f65bbc 100755
--- a/tests/ls/stat-failed
+++ b/tests/ls/stat-failed
@@ -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 && ls --version
+print_ver_ ls
skip_if_root_
mkdir d || framework_failure
diff --git a/tests/ls/stat-free-symlinks b/tests/ls/stat-free-symlinks
index f9b6bb5..5aa5f1e 100755
--- a/tests/ls/stat-free-symlinks
+++ b/tests/ls/stat-free-symlinks
@@ -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_strace_ stat
touch x || framework_failure
diff --git a/tests/ls/stat-vs-dirent b/tests/ls/stat-vs-dirent
index 00a0814..bfa1aba 100755
--- a/tests/ls/stat-vs-dirent
+++ b/tests/ls/stat-vs-dirent
@@ -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
root_dev_ino=`stat --format=%d-%i /`
diff --git a/tests/ls/symlink-slash b/tests/ls/symlink-slash
index 9db9ba6..578cd44 100755
--- a/tests/ls/symlink-slash
+++ b/tests/ls/symlink-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 && ls --version
+print_ver_ ls
mkdir dir || framework_failure
ln -s dir symlink || framework_failure
diff --git a/tests/ls/x-option b/tests/ls/x-option
index ed6ef62..e4859f7 100755
--- a/tests/ls/x-option
+++ b/tests/ls/x-option
@@ -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
mkdir subdir || framework_failure
touch subdir/b || framework_failure
diff --git a/tests/misc/arch b/tests/misc/arch
index 462919f..a6a209f 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 303c4e2..0d9fe34 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 7214c25..e29dbcb 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 3aefab5..cea296b 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 4daa848..0565252 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 e671f7f..cfa903d 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 a3044f7..b731668 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 e236558..b4b4023 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 98c704c..a71d873 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 259d514..4612d15 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 0e7f8b2..5e754f4 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 a9f19a5..e650b3e 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 22451c5..d30b7b2 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 bd4e0bc..c7be272 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 11343a1..1a20ffe 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 a8e1fa6..a802dfb 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 3fb98e5..89a5ea7 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 ea4b94a..0fe3716 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 ec157a2..3a131bf 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 70a0b45..7c46d0c 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 8d5d00a..fed1c23 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 8e38094..3b980ab 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 8a6eea3..0f67d54 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 721fb81..9e6c89e 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 fdbc4c2..0e873b1 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 049ed0f..15bb8bf 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 939a9aa..2948ce2 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 6c8314c..b81fda6 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 81d0a40..36fdde5 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 9d3d76a..c7054c5 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 424bbe0..0802c5c 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 1f12c9b..2af66fa 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 6d09f8e..958f956 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 0aecaf0..665ab09 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 d9c9338..02a6966 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 ae32c9c..394a94a 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 637c61d..f4025bb 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 ab66fa1..7492a9d 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 ee20df0..9cbc78d 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 e07ea82..e687ac2 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 2aeef77..a1a8e1d 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 2298553..a460785 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 0e2423c..8f0218d 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 e612ee0..b828c84 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 1355344..89fbc18 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 bba0760..6692d0b 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 e4b8adf..95f2c48 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 ee65a72..98710c1 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 67668a1..40b8168 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 bd6a9b8..b818a93 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 89a4084..1ed5095 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 c0fb2eb..c241b5c 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 07169e3..8fa3bc3 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 e659feb..c58b8a2 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 e6a07c2..1e7c513 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 27269e2..d861b92 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 ec19416..b0b22e4 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 2e64a2c..8967439 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 e584df0..3c84787 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 5e58ea4..b297dcf 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 2e0fdd2..19cbe7a 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 039ce50..c83e1b4 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 cd21596..de9030c 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 4f0660f..016fcb1 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 cc1d933..6edab5c 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 d80e3d4..b15d855 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 ed7fede..1520334 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 e8a0c5f..4e48880 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 5465f21..e8e31fd 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 59dddc8..b13cb5c 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 9562966..34dae09 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 e72eade..bc85e01 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 8c92026..7905f66 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 c5949e6..37a34dd 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 14c6b0e..0c2acc6 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 801b55d..83c88e1 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 cc94dc4..c10e959 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 68a3842..d6c3b3b 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 469ba5e..0c732a7 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 c5a87c2..a84b0d5 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 991c1c8..a5c6750 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 88aa63c..9ad4d6a 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 980ebff..858c9d3 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 a82fd9c..5e57264 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 7d3634e..5eaccc9 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 fd809f5..159da94 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)
diff --git a/tests/mkdir/p-1 b/tests/mkdir/p-1
index 9c8e8a5..060c05a 100755
--- a/tests/mkdir/p-1
+++ b/tests/mkdir/p-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 && mkdir --version
+print_ver_ mkdir
mkdir --parents "`pwd`/t" || fail=1
test -d t || fail=1
diff --git a/tests/mkdir/p-2 b/tests/mkdir/p-2
index 735d7ad..38c0adf 100755
--- a/tests/mkdir/p-2
+++ b/tests/mkdir/p-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 && mkdir --version
+print_ver_ mkdir
mkdir --parents "`pwd`/t/u" || fail=1
test -d t/u || fail=1
diff --git a/tests/mkdir/p-3 b/tests/mkdir/p-3
index ddc812e..bcfcf95 100755
--- a/tests/mkdir/p-3
+++ b/tests/mkdir/p-3
@@ -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 && mkdir --version
+print_ver_ mkdir
skip_if_root_
mkdir no-access || framework_failure
diff --git a/tests/mkdir/p-slashdot b/tests/mkdir/p-slashdot
index fba112d..6f3d354 100755
--- a/tests/mkdir/p-slashdot
+++ b/tests/mkdir/p-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 && mkdir --version
+print_ver_ mkdir
mkdir -p d1/. || fail=1
diff --git a/tests/mkdir/p-thru-slink b/tests/mkdir/p-thru-slink
index e2cc9c9..feb0738 100755
--- a/tests/mkdir/p-thru-slink
+++ b/tests/mkdir/p-thru-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 && mkdir --version
+print_ver_ mkdir
ln -s . slink || framework_failure
diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v
index aeae33d..d4a5536 100755
--- a/tests/mkdir/p-v
+++ b/tests/mkdir/p-v
@@ -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 && mkdir --version
+print_ver_ mkdir
mkdir -pv foo/a/b/c/d >out || fail=1
diff --git a/tests/mkdir/parents b/tests/mkdir/parents
index 951b6f9..56e106d 100755
--- a/tests/mkdir/parents
+++ b/tests/mkdir/parents
@@ -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 && mkdir --version
+print_ver_ mkdir
skip_if_setgid_
mkdir -m 700 e-dir || framework_failure
diff --git a/tests/mkdir/perm b/tests/mkdir/perm
index 0cd0a55..878e465 100755
--- a/tests/mkdir/perm
+++ b/tests/mkdir/perm
@@ -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 && mkdir --version
+print_ver_ mkdir
skip_if_setgid_
working_umask_or_skip_
diff --git a/tests/mkdir/special-1 b/tests/mkdir/special-1
index 7ed4370..cea2081 100755
--- a/tests/mkdir/special-1
+++ b/tests/mkdir/special-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 && mkdir --version
+print_ver_ mkdir
set_mode_string=u=rwx,g=rx,o=w,-s,+t
output_mode_string=drwxr-x-wT
diff --git a/tests/mkdir/t-slash b/tests/mkdir/t-slash
index ed72880..d23c89b 100755
--- a/tests/mkdir/t-slash
+++ b/tests/mkdir/t-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 && mkdir --version
+print_ver_ mkdir
mkdir -p dir/ || fail=1
diff --git a/tests/mkdir/writable-under-readonly
b/tests/mkdir/writable-under-readonly
index 2c8ac52..85de287 100755
--- a/tests/mkdir/writable-under-readonly
+++ b/tests/mkdir/writable-under-readonly
@@ -25,7 +25,7 @@
# Demonstrate the problem, as root:
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && mkdir --version
+print_ver_ mkdir
require_root_
# FIXME: for now, skip it unconditionally
diff --git a/tests/mv/atomic b/tests/mv/atomic
index 5df2d60..c75e62b 100755
--- a/tests/mv/atomic
+++ b/tests/mv/atomic
@@ -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 && mv --version
+print_ver_ mv
require_strace_ unlink
# Before the fix, mv would unnecessarily unlink the destination symlink:
diff --git a/tests/mv/atomic2 b/tests/mv/atomic2
index 4bc0e73..947f6b0 100755
--- a/tests/mv/atomic2
+++ b/tests/mv/atomic2
@@ -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 && mv --version
+print_ver_ mv
require_strace_ unlink
# Before the fix, mv would unnecessarily unlink the destination symlink:
diff --git a/tests/mv/backup-dir b/tests/mv/backup-dir
index a96edc6..c577883 100755
--- a/tests/mv/backup-dir
+++ b/tests/mv/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 && mv --version
+print_ver_ mv
mkdir A B || framework_failure
touch X Y || framework_failure
diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src
index fe5c680..9145b00 100755
--- a/tests/mv/backup-is-src
+++ b/tests/mv/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 && mv --version
+print_ver_ mv
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/diag b/tests/mv/diag
index d32513d..5a31c0b 100755
--- a/tests/mv/diag
+++ b/tests/mv/diag
@@ -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 && mv --version
+print_ver_ mv
touch f1 || framework_failure
touch f2 || framework_failure
diff --git a/tests/mv/dir-file b/tests/mv/dir-file
index ebe2a67..9fd125f 100755
--- a/tests/mv/dir-file
+++ b/tests/mv/dir-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 && mv --version
+print_ver_ mv
mkdir -p dir/file || framework_failure
> file || framework_failure
diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir
index de7770b..915a0fb 100755
--- a/tests/mv/dir2dir
+++ b/tests/mv/dir2dir
@@ -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
mkdir -p a/t b/t || framework_failure
touch a/t/f || framework_failure
diff --git a/tests/mv/force b/tests/mv/force
index 708efcb..08c5cf7 100755
--- a/tests/mv/force
+++ b/tests/mv/force
@@ -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 && mv --version
+print_ver_ mv
ff=mvforce
ff2=mvforce2
diff --git a/tests/mv/hard-3 b/tests/mv/hard-3
index 61d71c1..eb69b02 100755
--- a/tests/mv/hard-3
+++ b/tests/mv/hard-3
@@ -31,7 +31,7 @@
# mv enables by default.
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && cp --version
+print_ver_ cp
skip_if_root_
mkdir -p x dst/x || framework_failure
diff --git a/tests/mv/hard-4 b/tests/mv/hard-4
index b22969e..4764640 100755
--- a/tests/mv/hard-4
+++ b/tests/mv/hard-4
@@ -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 && mv --version
+print_ver_ mv
touch a || framework_failure
ln a b || framework_failure
diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1
index 3d7c6ab..b03d926 100755
--- a/tests/mv/hard-link-1
+++ b/tests/mv/hard-link-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 && mv --version
+print_ver_ mv
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose
index 8c0dfe0..5a057b4 100755
--- a/tests/mv/hard-verbose
+++ b/tests/mv/hard-verbose
@@ -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 && mv --version
+print_ver_ mv
touch x || framework_failure
ln x y || framework_failure
diff --git a/tests/mv/i-3 b/tests/mv/i-3
index fededda..983aad9 100755
--- a/tests/mv/i-3
+++ b/tests/mv/i-3
@@ -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
require_controlling_input_terminal_
skip_if_root_
trap '' TTIN # Ignore SIGTTIN
diff --git a/tests/mv/i-4 b/tests/mv/i-4
index d5d7465..72d0f11 100755
--- a/tests/mv/i-4
+++ b/tests/mv/i-4
@@ -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 && mv --version
+print_ver_ mv
for i in a b; do
echo $i > $i || framework_failure
diff --git a/tests/mv/i-5 b/tests/mv/i-5
index e73d4b2..bcf3fd9 100755
--- a/tests/mv/i-5
+++ b/tests/mv/i-5
@@ -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 && mv --version
+print_ver_ mv
mkdir a || framework_failure
touch b || framework_failure
diff --git a/tests/mv/i-link-no b/tests/mv/i-link-no
index 2d76301..471765d 100755
--- a/tests/mv/i-link-no
+++ b/tests/mv/i-link-no
@@ -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 && mv --version
+print_ver_ mv
mkdir a b || framework_failure
echo foo > a/foo || framework_failure
diff --git a/tests/mv/into-self b/tests/mv/into-self
index 2c28a2f..42786bd 100755
--- a/tests/mv/into-self
+++ b/tests/mv/into-self
@@ -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 && mv --version
+print_ver_ mv
dir=toself-dir
file=toself-file
diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2
index c5d1bd5..1bd90e0 100755
--- a/tests/mv/into-self-2
+++ b/tests/mv/into-self-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 && mv --version
+print_ver_ mv
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3
index 8a50662..8a82e89 100755
--- a/tests/mv/into-self-3
+++ b/tests/mv/into-self-3
@@ -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 && mv --version
+print_ver_ mv
dir1=is3-dir1
dir2=is3-dir2
diff --git a/tests/mv/into-self-4 b/tests/mv/into-self-4
index 18a32dc..ed4d4f5 100755
--- a/tests/mv/into-self-4
+++ b/tests/mv/into-self-4
@@ -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
touch file || framework_failure
ln -s file s || framework_failure
diff --git a/tests/mv/leak-fd b/tests/mv/leak-fd
index 3155397..229c63e 100755
--- a/tests/mv/leak-fd
+++ b/tests/mv/leak-fd
@@ -19,7 +19,7 @@
# limit so don't run it by default.
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && mv --version
+print_ver_ mv
skip_if_root_
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/mv-n b/tests/mv/mv-n
index 32739dd..8cbf1b9 100755
--- a/tests/mv/mv-n
+++ b/tests/mv/mv-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 && mv --version
+print_ver_ mv
# test miscellaneous combinations of -f -i -n parameters
diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1
index fe10acd..8e7bfcd 100755
--- a/tests/mv/mv-special-1
+++ b/tests/mv/mv-special-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 && mv --version
+print_ver_ mv
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/no-target-dir b/tests/mv/no-target-dir
index f1d886b..56930fd 100755
--- a/tests/mv/no-target-dir
+++ b/tests/mv/no-target-dir
@@ -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
mkdir -p d/sub empty src d2/sub e2 || framework_failure
touch f || framework_failure
diff --git a/tests/mv/part-fail b/tests/mv/part-fail
index c167076..2d80f59 100755
--- a/tests/mv/part-fail
+++ b/tests/mv/part-fail
@@ -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 && mv --version
+print_ver_ mv
skip_if_root_
cleanup_() { t=$other_partition_tmpdir; chmod -R 700 "$t"; rm -rf "$t"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/part-hardlink b/tests/mv/part-hardlink
index b97b0a0..8eaf5cd 100755
--- a/tests/mv/part-hardlink
+++ b/tests/mv/part-hardlink
@@ -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 && mv --version
+print_ver_ mv
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/part-rename b/tests/mv/part-rename
index 3f18045..41e60fb 100755
--- a/tests/mv/part-rename
+++ b/tests/mv/part-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 && mv --version
+print_ver_ mv
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm
index 01b1697..d043630 100755
--- a/tests/mv/partition-perm
+++ b/tests/mv/partition-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 && mv --version
+print_ver_ mv
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/perm-1 b/tests/mv/perm-1
index fda23ed..944f631 100755
--- a/tests/mv/perm-1
+++ b/tests/mv/perm-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 && mv --version
+print_ver_ mv
skip_if_root_
mkdir -p no-write/dir || framework_failure
diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart
index 513c325..dbb5584 100755
--- a/tests/mv/sticky-to-xpart
+++ b/tests/mv/sticky-to-xpart
@@ -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 && mv --version
+print_ver_ mv
require_root_
cleanup_() { rm -rf "$other_partition_tmpdir"; }
diff --git a/tests/mv/to-symlink b/tests/mv/to-symlink
index 5530eee..26b7a27 100755
--- a/tests/mv/to-symlink
+++ b/tests/mv/to-symlink
@@ -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
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/trailing-slash b/tests/mv/trailing-slash
index b0b362c..b58c908 100755
--- a/tests/mv/trailing-slash
+++ b/tests/mv/trailing-slash
@@ -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 && mv --version
+print_ver_ mv
mkdir foo || framework_failure
diff --git a/tests/readlink/can-e b/tests/readlink/can-e
index d7e934e..2d2868d 100755
--- a/tests/readlink/can-e
+++ b/tests/readlink/can-e
@@ -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
pwd=`pwd`
my_pwd=$("$abs_top_builddir/src/pwd")
diff --git a/tests/readlink/can-f b/tests/readlink/can-f
index a5020e6..7ed5b08 100755
--- a/tests/readlink/can-f
+++ b/tests/readlink/can-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 && readlink --version
+print_ver_ readlink
pwd=`pwd`
my_pwd=$("$abs_top_builddir/src/pwd")
diff --git a/tests/readlink/can-m b/tests/readlink/can-m
index cf7c994..b5cfc1d 100755
--- a/tests/readlink/can-m
+++ b/tests/readlink/can-m
@@ -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
pwd=`pwd`
my_pwd=$("$abs_top_builddir/src/pwd")
diff --git a/tests/readlink/rl-1 b/tests/readlink/rl-1
index 36dde3d..0b03595 100755
--- a/tests/readlink/rl-1
+++ b/tests/readlink/rl-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 && readlink --version
+print_ver_ readlink
mkdir subdir || framework_failure
touch regfile || framework_failure
diff --git a/tests/rm/cycle b/tests/rm/cycle
index 4af7afe..709969a 100755
--- a/tests/rm/cycle
+++ b/tests/rm/cycle
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
mkdir -p a/b
diff --git a/tests/rm/dangling-symlink b/tests/rm/dangling-symlink
index b082901..13dfea8 100755
--- a/tests/rm/dangling-symlink
+++ b/tests/rm/dangling-symlink
@@ -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 && rm --version
+print_ver_ rm
ln -s no-file dangle
ln -s / symlink
diff --git a/tests/rm/deep-1 b/tests/rm/deep-1
index b21e1e6..8ce291c 100755
--- a/tests/rm/deep-1
+++ b/tests/rm/deep-1
@@ -24,7 +24,7 @@
# If this test takes too long on your system, blame the OS.
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && rm --version
+print_ver_ rm
umask 022
diff --git a/tests/rm/deep-2 b/tests/rm/deep-2
index c90f607..4e1b27b 100755
--- a/tests/rm/deep-2
+++ b/tests/rm/deep-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 && rm --version
+print_ver_ rm
# Root can run this test, but it always succeeds, since for root, all
# files are writable, and write_protected_non_symlink never reaches
diff --git a/tests/rm/dir-no-w b/tests/rm/dir-no-w
index 8dc19d4..ae38062 100755
--- a/tests/rm/dir-no-w
+++ b/tests/rm/dir-no-w
@@ -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
mkdir --mode=0500 unwritable-dir || framework_failure
diff --git a/tests/rm/dir-nonrecur b/tests/rm/dir-nonrecur
index 816b72d..3ed2d0a 100755
--- a/tests/rm/dir-nonrecur
+++ b/tests/rm/dir-nonrecur
@@ -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
mkdir d || framework_failure
diff --git a/tests/rm/dot-rel b/tests/rm/dot-rel
index 81d405a..910ed50 100755
--- a/tests/rm/dot-rel
+++ b/tests/rm/dot-rel
@@ -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
mkdir a b || framework_failure
touch a/f b/f || framework_failure
diff --git a/tests/rm/empty-inacc b/tests/rm/empty-inacc
index 3aef6ab..573fd24 100755
--- a/tests/rm/empty-inacc
+++ b/tests/rm/empty-inacc
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
mkdir -m0 inacc || framework_failure
diff --git a/tests/rm/ext3-perf b/tests/rm/ext3-perf
index 155de18..3fa4e91 100755
--- a/tests/rm/ext3-perf
+++ b/tests/rm/ext3-perf
@@ -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 && rm --version
+print_ver_ rm
very_expensive_
diff --git a/tests/rm/f-1 b/tests/rm/f-1
index 6400d5b..4511cbe 100755
--- a/tests/rm/f-1
+++ b/tests/rm/f-1
@@ -19,7 +19,7 @@
test=f-1
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && rm --version
+print_ver_ rm
mkdir -p d || framework_failure
diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm
index 0085d1f..416c97e 100755
--- a/tests/rm/fail-2eperm
+++ b/tests/rm/fail-2eperm
@@ -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
require_root_
# The containing directory must be owned by the user who eventually runs rm.
diff --git a/tests/rm/fail-eacces b/tests/rm/fail-eacces
index fc20bd6..3010a00 100755
--- a/tests/rm/fail-eacces
+++ b/tests/rm/fail-eacces
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
ok=0
diff --git a/tests/rm/hash b/tests/rm/hash
index 8a4d661..fafafdc 100755
--- a/tests/rm/hash
+++ b/tests/rm/hash
@@ -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 && rm --version
+print_ver_ rm
expensive_
# Create a hierarchy with 3*26 leaf directories, each at depth 153.
diff --git a/tests/rm/i-1 b/tests/rm/i-1
index 20e88e8..fdcbecb 100755
--- a/tests/rm/i-1
+++ b/tests/rm/i-1
@@ -19,7 +19,7 @@
test=i-1
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && rm --version
+print_ver_ rm
t=t
mkdir -p $t || framework_failure
diff --git a/tests/rm/i-never b/tests/rm/i-never
index b00d3ef..1c9fe84 100755
--- a/tests/rm/i-never
+++ b/tests/rm/i-never
@@ -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
skip_if_root_
touch f || framework_failure
diff --git a/tests/rm/i-no-r b/tests/rm/i-no-r
index 3178a98..896949d 100755
--- a/tests/rm/i-no-r
+++ b/tests/rm/i-no-r
@@ -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 && rm --version
+print_ver_ rm
mkdir dir || framework_failure
echo y > y || framework_failure
diff --git a/tests/rm/ignorable b/tests/rm/ignorable
index 9028de8..00fc24f 100755
--- a/tests/rm/ignorable
+++ b/tests/rm/ignorable
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
touch existing-non-dir || framework_failure
diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible
index 6e09de6..bdc1d44 100755
--- a/tests/rm/inaccessible
+++ b/tests/rm/inaccessible
@@ -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
# Skip this test if your system has neither the openat-style functions
# nor /proc/self/fd support with which to emulate them.
diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always
index 9e15e22..7a12970 100755
--- a/tests/rm/interactive-always
+++ b/tests/rm/interactive-always
@@ -19,7 +19,7 @@
test=interactive-always
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && rm --version
+print_ver_ rm
touch file1-1 file1-2 file2-1 file2-2 file3-1 file3-2 file4-1 file4-2 \
|| framework_failure
diff --git a/tests/rm/interactive-once b/tests/rm/interactive-once
index 48086d7..facef7c 100755
--- a/tests/rm/interactive-once
+++ b/tests/rm/interactive-once
@@ -19,7 +19,7 @@
test=interactive-once
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && rm --version
+print_ver_ rm
mkdir -p dir1-1 dir2-1 dir2-2 || framework_failure
touch file1-1 file2-1 file2-2 file2-3 file3-1 file3-2 file3-3 file3-4 \
diff --git a/tests/rm/ir-1 b/tests/rm/ir-1
index b48fa94..51cacad 100755
--- a/tests/rm/ir-1
+++ b/tests/rm/ir-1
@@ -19,7 +19,7 @@
test=ir-1
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && rm --version
+print_ver_ rm
t=t
mkdir -p $t $t/a $t/b $t/c || framework_failure
diff --git a/tests/rm/isatty b/tests/rm/isatty
index 1b18654..a6e5335 100755
--- a/tests/rm/isatty
+++ b/tests/rm/isatty
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up
index e85196c..70a9ee3 100755
--- a/tests/rm/no-give-up
+++ b/tests/rm/no-give-up
@@ -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
require_root_
mkdir d || framework_failure
diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system
index 371607b..a8cae48 100755
--- a/tests/rm/one-file-system
+++ b/tests/rm/one-file-system
@@ -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 && rm --version
+print_ver_ rm
require_root_
cleanup_()
diff --git a/tests/rm/one-file-system2 b/tests/rm/one-file-system2
index 83a9cec..279c311 100755
--- a/tests/rm/one-file-system2
+++ b/tests/rm/one-file-system2
@@ -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 && rm --version
+print_ver_ rm
mkdir -p a/b
diff --git a/tests/rm/r-1 b/tests/rm/r-1
index e07881b..fb9eab2 100755
--- a/tests/rm/r-1
+++ b/tests/rm/r-1
@@ -20,7 +20,7 @@
test=r-1
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && rm --version
+print_ver_ rm
mkdir a a/a || framework_failure
> b || framework_failure
diff --git a/tests/rm/r-2 b/tests/rm/r-2
index 485620f..91a1209 100755
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -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
mkdir t t/a t/a/b || framework_failure
> t/a/f || framework_failure
diff --git a/tests/rm/r-3 b/tests/rm/r-3
index 8296850..c00529c 100755
--- a/tests/rm/r-3
+++ b/tests/rm/r-3
@@ -24,7 +24,7 @@
# are 338 or more files in a directory on a Darwin-6.5 system
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && rm --version
+print_ver_ rm
mkdir t || framework_failure
cd t || framework_failure
diff --git a/tests/rm/r-4 b/tests/rm/r-4
index c8d3f9b..e7bb9a8 100755
--- a/tests/rm/r-4
+++ b/tests/rm/r-4
@@ -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 && rm --version
+print_ver_ rm
mkdir d || framework_failure
touch d/a || framework_failure
diff --git a/tests/rm/read-only b/tests/rm/read-only
index c542594..4cbd548 100755
--- a/tests/rm/read-only
+++ b/tests/rm/read-only
@@ -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 && rm --version
+print_ver_ rm
require_root_
cwd=`pwd`
diff --git a/tests/rm/readdir-bug b/tests/rm/readdir-bug
index be3e546..2c813b9 100755
--- a/tests/rm/readdir-bug
+++ b/tests/rm/readdir-bug
@@ -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
# Create a directory containing many files.
# What counts is a combination of the number of files and
diff --git a/tests/rm/rm1 b/tests/rm/rm1
index 46ae769..23456d0 100755
--- a/tests/rm/rm1
+++ b/tests/rm/rm1
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
mkdir -p b/a/p b/c b/d || framework_failure
diff --git a/tests/rm/rm2 b/tests/rm/rm2
index 11b153f..32aaf8c 100755
--- a/tests/rm/rm2
+++ b/tests/rm/rm2
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
mkdir -p a/0 || framework_failure
diff --git a/tests/rm/rm3 b/tests/rm/rm3
index b62dec6..1c3f2b9 100755
--- a/tests/rm/rm3
+++ b/tests/rm/rm3
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
mkdir -p z || framework_failure
diff --git a/tests/rm/rm4 b/tests/rm/rm4
index 571fdb0..f9f4e8f 100755
--- a/tests/rm/rm4
+++ b/tests/rm/rm4
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
mkdir dir || framework_failure
diff --git a/tests/rm/rm5 b/tests/rm/rm5
index 1d27f7c..a6f6fc4 100755
--- a/tests/rm/rm5
+++ b/tests/rm/rm5
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
mkdir -p d/e || framework_failure
diff --git a/tests/rm/sunos-1 b/tests/rm/sunos-1
index 3057ecb..846ca20 100755
--- a/tests/rm/sunos-1
+++ b/tests/rm/sunos-1
@@ -23,7 +23,7 @@
# but relative to `/' rather than relative to the current directory.
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && rm --version
+print_ver_ rm
rm -r '' > /dev/null 2>&1 && fail=1
diff --git a/tests/rm/unread2 b/tests/rm/unread2
index 69c2747..a672983 100755
--- a/tests/rm/unread2
+++ b/tests/rm/unread2
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
mkdir -p a/b || framework_failure
diff --git a/tests/rm/unread3 b/tests/rm/unread3
index a2782bb..a95562d 100755
--- a/tests/rm/unread3
+++ b/tests/rm/unread3
@@ -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 && rm --version
+print_ver_ rm
skip_if_root_
mkdir -p a/1 b c d/2 e/3 || framework_failure
diff --git a/tests/rm/v-slash b/tests/rm/v-slash
index a9ab828..7734df7 100755
--- a/tests/rm/v-slash
+++ b/tests/rm/v-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 && rm --version
+print_ver_ rm
mkdir a || framework_failure
touch a/x || framework_failure
diff --git a/tests/rmdir/fail-perm b/tests/rmdir/fail-perm
index 8c37f8d..bf1245f 100755
--- a/tests/rmdir/fail-perm
+++ b/tests/rmdir/fail-perm
@@ -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 && rmdir --version
+print_ver_ rmdir
mkdir d d/e d/e/f || framework_failure
chmod a-w d || framework_failure
diff --git a/tests/rmdir/ignore b/tests/rmdir/ignore
index 0818360..ffd0090 100755
--- a/tests/rmdir/ignore
+++ b/tests/rmdir/ignore
@@ -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 && rmdir --version
+print_ver_ rmdir
cwd=`pwd`
mkdir -p "$cwd/a/b/c" "$cwd/a/x" || framework_failure
diff --git a/tests/rmdir/t-slash b/tests/rmdir/t-slash
index f7d1f0d..f83b628 100755
--- a/tests/rmdir/t-slash
+++ b/tests/rmdir/t-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 && rmdir --version
+print_ver_ rmdir
mkdir dir || framework_failure
diff --git a/tests/sample-test b/tests/sample-test
index 27dc3b2..a12fe49 100644
--- a/tests/sample-test
+++ b/tests/sample-test
@@ -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 && FIXME --version
+print_ver_ FIXME
# FIXME: skip_if_root_
# FIXME: require_root_
diff --git a/tests/tail-2/F-vs-missing b/tests/tail-2/F-vs-missing
index 8c1d018..50e8ab4 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 98b36e7..93971d2 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 32578fe..e99bff2 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 1fdb76a..560f6c7 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 fec0525..decbaae 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 3496a62..a32eaaa 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 df8810d..14a4f7b 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 1c50e8b..0b39bc6 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 7e98daf..38ee6f1 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 d45668a..86454c5 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 f3018a5..abd101c 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 2deff69..8ff388b 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 b684a36..a1fa58c 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 b6fef16..ae68a5f 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 426f37b..0b9fd28 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 3e63bfe..ae00740 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 404562d..4727371 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 d7badd7..007e5d7 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 36cfa0e..a1c7fcd 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
diff --git a/tests/touch/60-seconds b/tests/touch/60-seconds
index e50c257..9e94d47 100755
--- a/tests/touch/60-seconds
+++ b/tests/touch/60-seconds
@@ -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 && touch --version
+print_ver_ touch
echo 60.000000000 > exp || framework_failure
diff --git a/tests/touch/dangling-symlink b/tests/touch/dangling-symlink
index 55466c4..a81b4bc 100755
--- a/tests/touch/dangling-symlink
+++ b/tests/touch/dangling-symlink
@@ -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 && touch --version
+print_ver_ touch
rm -f touch-target t-symlink
ln -s touch-target t-symlink
diff --git a/tests/touch/dir-1 b/tests/touch/dir-1
index 2d61bb5..b4c04fe 100755
--- a/tests/touch/dir-1
+++ b/tests/touch/dir-1
@@ -3,7 +3,7 @@
# This was broken in the 4.0[efg] test releases.
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && touch --version
+print_ver_ touch
touch . || fail=1
Exit $fail
diff --git a/tests/touch/empty-file b/tests/touch/empty-file
index e93bf0a..e927d4a 100755
--- a/tests/touch/empty-file
+++ b/tests/touch/empty-file
@@ -22,7 +22,7 @@
# the empty file is on an NFS-mounted 4.2 volume.
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && touch --version
+print_ver_ touch
DEFAULT_SLEEP_SECONDS=2
SLEEP_SECONDS=${SLEEP_SECONDS=$DEFAULT_SLEEP_SECONDS}
diff --git a/tests/touch/fail-diag b/tests/touch/fail-diag
index a957a8f..11f6784 100755
--- a/tests/touch/fail-diag
+++ b/tests/touch/fail-diag
@@ -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 && touch --version
+print_ver_ touch
skip_if_root_
d1=no-$$
diff --git a/tests/touch/fifo b/tests/touch/fifo
index e6743d1..bf1f0ab 100755
--- a/tests/touch/fifo
+++ b/tests/touch/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 && touch --version
+print_ver_ touch
mkfifo_or_skip_ fifo
diff --git a/tests/touch/no-create-missing b/tests/touch/no-create-missing
index 96aa092..a81560f 100755
--- a/tests/touch/no-create-missing
+++ b/tests/touch/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 && touch --version
+print_ver_ touch
touch -c no-file > /dev/null 2>&1 || fail=1
diff --git a/tests/touch/no-dereference b/tests/touch/no-dereference
index 95002e5..ce6623e 100755
--- a/tests/touch/no-dereference
+++ b/tests/touch/no-dereference
@@ -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 && touch --version
+print_ver_ touch
ln -s nowhere dangling || framework_failure
touch file || framework_failure
diff --git a/tests/touch/no-rights b/tests/touch/no-rights
index d203255..c041edb 100755
--- a/tests/touch/no-rights
+++ b/tests/touch/no-rights
@@ -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 && touch --version
+print_ver_ touch
# Make sure t2 is newer than t1.
touch -d '2000-01-01 00:00' t1 || framework_failure
diff --git a/tests/touch/not-owner b/tests/touch/not-owner
index 9645f4d..ea4b54c 100755
--- a/tests/touch/not-owner
+++ b/tests/touch/not-owner
@@ -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 && touch --version
+print_ver_ touch
if env -- test -w /; then
skip_test_ you have write access to /.
diff --git a/tests/touch/now-owned-by-other b/tests/touch/now-owned-by-other
index c721502..c475903 100755
--- a/tests/touch/now-owned-by-other
+++ b/tests/touch/now-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 && touch --version
+print_ver_ touch
require_root_
group_num=$(id -g $NON_ROOT_USERNAME)
diff --git a/tests/touch/obsolescent b/tests/touch/obsolescent
index 9821fc1..20c398d 100755
--- a/tests/touch/obsolescent
+++ b/tests/touch/obsolescent
@@ -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 && touch --version
+print_ver_ touch
_POSIX2_VERSION=199209; export _POSIX2_VERSION
POSIXLY_CORRECT=1; export POSIXLY_CORRECT
diff --git a/tests/touch/read-only b/tests/touch/read-only
index 265f288..c65055d 100755
--- a/tests/touch/read-only
+++ b/tests/touch/read-only
@@ -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 && touch --version
+print_ver_ touch
skip_if_root_
: > read-only || framework_failure
diff --git a/tests/touch/relative b/tests/touch/relative
index 7e56a30..0c5e367 100755
--- a/tests/touch/relative
+++ b/tests/touch/relative
@@ -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 && touch --version
+print_ver_ touch
TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure
diff --git a/tests/touch/trailing-slash b/tests/touch/trailing-slash
index 97b9100..cc5e7c6 100755
--- a/tests/touch/trailing-slash
+++ b/tests/touch/trailing-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 && touch --version
+print_ver_ touch
ln -s nowhere dangling || framework_failure
ln -s loop loop || framework_failure
--
1.7.3.2.4.g60aa9
>From a8c8484ee17f09ac92a27308b6ee5eaf4304bddc Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 17 Nov 2010 21:42:13 +0100
Subject: [PATCH 3/5] tests: convert "... env -- prog --version" uses
E.g.,
-test "$VERBOSE" = yes && env -- pwd --version
+print_ver_ pwd
git grep -l 'VERBOSE.*--version'|xargs perl -pi -e \
's/test "\$VERBOSE" = yes && env -- (\w+) --version/print_ver_ $1/'
---
tests/misc/printenv | 2 +-
tests/misc/printf | 2 +-
tests/misc/printf-hex | 2 +-
tests/misc/printf-surprise | 2 +-
tests/misc/pwd-long | 2 +-
tests/misc/pwd-option | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tests/misc/printenv b/tests/misc/printenv
index 67173ed..4a56917 100755
--- a/tests/misc/printenv
+++ b/tests/misc/printenv
@@ -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 && env -- printenv --version
+print_ver_ printenv
# Without arguments, printenv behaves like env. Some shells provide
# printenv as a builtin, so we must invoke it via "env".
diff --git a/tests/misc/printf b/tests/misc/printf
index b0fe19c..b02352b 100755
--- a/tests/misc/printf
+++ b/tests/misc/printf
@@ -19,7 +19,7 @@
prog="$abs_top_builddir/src/printf"
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && env -- printf --version
+print_ver_ printf
getlimits_
diff --git a/tests/misc/printf-hex b/tests/misc/printf-hex
index 864dc0b..4853d39 100755
--- a/tests/misc/printf-hex
+++ b/tests/misc/printf-hex
@@ -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 && env -- printf --version
+print_ver_ printf
env printf '\x7e3\n' > out || fail=1
cat <<\EOF > exp
diff --git a/tests/misc/printf-surprise b/tests/misc/printf-surprise
index 53f46b5..d37a329 100755
--- a/tests/misc/printf-surprise
+++ b/tests/misc/printf-surprise
@@ -19,7 +19,7 @@
prog=printf
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && env -- printf --version
+print_ver_ printf
require_ulimit_
diff --git a/tests/misc/pwd-long b/tests/misc/pwd-long
index b3d14c6..e8b088c 100755
--- a/tests/misc/pwd-long
+++ b/tests/misc/pwd-long
@@ -21,7 +21,7 @@
. $srcdir/require-perl
. "${srcdir=.}/init.sh"; path_prepend_ ../src
-test "$VERBOSE" = yes && env -- pwd --version
+print_ver_ pwd
require_readable_root_
diff --git a/tests/misc/pwd-option b/tests/misc/pwd-option
index e010266..21c5e40 100755
--- a/tests/misc/pwd-option
+++ b/tests/misc/pwd-option
@@ -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 && env -- pwd --version
+print_ver_ pwd
mkdir -p a/b || framework_failure
ln -s a/b c || framework_failure
--
1.7.3.2.4.g60aa9
>From 8f9be76b0d6995919ee960ce5864715faa11ea5b Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Wed, 17 Nov 2010 21:38:38 +0100
Subject: [PATCH 4/5] tests: convert the multi-prog $VERBOSE/--version uses
E.g.,
-test "$VERBOSE" = yes && { env -- pwd --version; readlink --version; }
+print_ver_ pwd readlink
-test "$VERBOSE" = yes && { stdbuf --version; mv --version; }
+print_ver_ stdbuf mv
Use this command:
git grep -l 'VERBOSE.*--version'|xargs perl -ni \
-e '/^test "\$VERBOSE" = yes && { .*--version/ or print,next;' \
-e 's/env -- //g;' \
-e 's/test "\$VERBOSE" = yes && { /print_ver_ /;' \
-e ' s/(\w+) --version;/$1/g; s/ *}$//; print'
---
tests/chmod/silent | 2 +-
tests/cp/acl | 2 +-
tests/cp/cp-mv-enotsup-xattr | 2 +-
tests/cp/perm | 2 +-
tests/ls/rt-1 | 2 +-
tests/misc/env-null | 2 +-
tests/misc/pwd-unreadable-parent | 2 +-
tests/misc/stdbuf | 2 +-
tests/misc/xattr | 2 +-
tests/mkdir/selinux | 2 +-
tests/mv/acl | 2 +-
tests/mv/childproof | 2 +-
tests/mv/dup-source | 2 +-
tests/mv/hard-2 | 2 +-
tests/mv/i-2 | 2 +-
tests/mv/part-symlink | 2 +-
tests/mv/update | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/tests/chmod/silent b/tests/chmod/silent
index 20c232b..f56e347 100755
--- a/tests/chmod/silent
+++ b/tests/chmod/silent
@@ -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 && { chgrp --version; chmod --version; chown --version; }
+print_ver_ chgrp chmod chown
chmod -f 0 no-such 2> out && fail=1
chgrp -f 0 no-such 2>> out && fail=1
diff --git a/tests/cp/acl b/tests/cp/acl
index a3b909a..3926757 100755
--- a/tests/cp/acl
+++ b/tests/cp/acl
@@ -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; getfacl --version; setfacl --version;
}
+print_ver_ mv getfacl setfacl
require_acl_
diff --git a/tests/cp/cp-mv-enotsup-xattr b/tests/cp/cp-mv-enotsup-xattr
index bcee421..d3516f6 100755
--- a/tests/cp/cp-mv-enotsup-xattr
+++ b/tests/cp/cp-mv-enotsup-xattr
@@ -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 && { cp --version; mv --version; }
+print_ver_ cp mv
require_root_
diff --git a/tests/cp/perm b/tests/cp/perm
index cb4709f..e5fdb09 100755
--- a/tests/cp/perm
+++ b/tests/cp/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; mv --version; }
+print_ver_ cp mv
very_expensive_
diff --git a/tests/ls/rt-1 b/tests/ls/rt-1
index 909deb1..56de502 100755
--- a/tests/ls/rt-1
+++ b/tests/ls/rt-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 && { ls --version; touch --version; }
+print_ver_ ls touch
date=1998-01-15
diff --git a/tests/misc/env-null b/tests/misc/env-null
index c08856c..8d5b85a 100755
--- a/tests/misc/env-null
+++ b/tests/misc/env-null
@@ -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 && { env --version; env -- printenv --version; }
+print_ver_ env printenv
# POSIX is clear that environ may, but need not be, sorted.
# Environment variable values may contain newlines, which cannot be
diff --git a/tests/misc/pwd-unreadable-parent b/tests/misc/pwd-unreadable-parent
index b24a97c..9483981 100755
--- a/tests/misc/pwd-unreadable-parent
+++ b/tests/misc/pwd-unreadable-parent
@@ -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 && { env -- pwd --version; readlink --version; }
+print_ver_ pwd readlink
test $host_os != linux-gnu &&
skip_test_ 'vendor getcwd may be inadequate'
diff --git a/tests/misc/stdbuf b/tests/misc/stdbuf
index 4a694c7..59c7803 100755
--- a/tests/misc/stdbuf
+++ b/tests/misc/stdbuf
@@ -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 && { stdbuf --version; mv --version; }
+print_ver_ stdbuf mv
getlimits_
require_built_ stdbuf
diff --git a/tests/misc/xattr b/tests/misc/xattr
index 13e0857..67dfdef 100755
--- a/tests/misc/xattr
+++ b/tests/misc/xattr
@@ -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 && { cp --version; mv --version; ginstall --version; }
+print_ver_ cp mv ginstall
# Skip this test if cp was built without xattr support:
touch src dest || framework_failure
diff --git a/tests/mkdir/selinux b/tests/mkdir/selinux
index f055cb8..e7fadf9 100755
--- a/tests/mkdir/selinux
+++ b/tests/mkdir/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 && { mkdir --version; mkfifo --version; mknod --version;
}
+print_ver_ mkdir mkfifo mknod
# Note: on an SELinux/enforcing system running mcstransd older than
# mcstrans-0.2.8-1.fc9, the following commands may mistakenly exit
diff --git a/tests/mv/acl b/tests/mv/acl
index 75f5007..4157ab5 100755
--- a/tests/mv/acl
+++ b/tests/mv/acl
@@ -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; getfacl --version; setfacl --version;
}
+print_ver_ mv getfacl setfacl
require_acl_
diff --git a/tests/mv/childproof b/tests/mv/childproof
index ed6c180..fadf44e 100755
--- a/tests/mv/childproof
+++ b/tests/mv/childproof
@@ -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 && { cp --version; mv --version; ln --version; }
+print_ver_ cp mv ln
skip_if_root_
diff --git a/tests/mv/dup-source b/tests/mv/dup-source
index 34ef633..c70753f 100755
--- a/tests/mv/dup-source
+++ b/tests/mv/dup-source
@@ -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; mv --version; }
+print_ver_ cp mv
skip_if_root_
diff --git a/tests/mv/hard-2 b/tests/mv/hard-2
index eb83b11..d86435a 100755
--- a/tests/mv/hard-2
+++ b/tests/mv/hard-2
@@ -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; mv --version; }
+print_ver_ cp mv
skip_if_root_
diff --git a/tests/mv/i-2 b/tests/mv/i-2
index 7e49bca..0308282 100755
--- a/tests/mv/i-2
+++ b/tests/mv/i-2
@@ -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; mv --version; }
+print_ver_ cp mv
skip_if_root_
diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink
index 3f67d6c..425718a 100755
--- a/tests/mv/part-symlink
+++ b/tests/mv/part-symlink
@@ -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; mv --version; }
+print_ver_ cp mv
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/update b/tests/mv/update
index 5bee53c..94a8927 100755
--- a/tests/mv/update
+++ b/tests/mv/update
@@ -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; mv --version; }
+print_ver_ cp mv
echo old > old || framework_failure
touch -d yesterday old || framework_failure
--
1.7.3.2.4.g60aa9
>From ae5cfc9f12ddb7a3d1740bb0558726cbbd7d9cb6 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Tue, 16 Nov 2010 08:32:00 +0100
Subject: [PATCH 5/5] tests: convert tests/misc/selinux manually
---
tests/misc/selinux | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tests/misc/selinux b/tests/misc/selinux
index 0d798c1..1edb501 100755
--- a/tests/misc/selinux
+++ b/tests/misc/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 && for i in chcon cp ls mv stat; do $i --version; done
+print_ver_ chcon cp ls mv stat
require_root_
require_selinux_
--
1.7.3.2.4.g60aa9
- [coreutils] [PATCH 1/5] tests: factor out VERBOSE-only --version-printing code,
Jim Meyering <=