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

diff --git a/tests/chgrp/basic b/tests/chgrp/basic
index 7d6716624afea59c0d352d4094006533b83a6431..91b111ff906ccbb0950f07d9b9ae48b7d6c4f7e8 100755 (executable)
--- 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 77d3bcbcbe61b070180bb62354501c96a64f5524..0b380acd5ff39f849d8deb1c09750f440be0daff 100755 (executable)
--- 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 e3cfed2294d6111707b0f172fd285c590a74c884..d470fe12bc263b677f3676e8bcf48711ed76b902 100755 (executable)
--- 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 e3a4aefd0cc480fd0cb071dfaae23d7d24eb728f..d309bd761ce9f6db2fd50ea34fc7b49bb5c65b45 100755 (executable)
--- 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 6cf101c8f6612b52a6c6696e2b1cf4f96d75a277..c5aeb4bfd2c68b53ca7b33f8049151918e07f8b9 100755 (executable)
--- 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 0f7f00f223c0aed9f75807957b8626dccc77f416..9f92fdb3585046bba8a2682f1562fb656d0aaa69 100755 (executable)
--- 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 4db905fc63e54e5c25cfab3debf67327eb673b25..440702fd2bc8d6b73e1a57141c1b2f563cba5bf7 100755 (executable)
--- 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 32226f1ff093548d56ec80de1c91a62e5368ab92..bb9e4b2da2422684fa202cb4e438d354ff38138c 100755 (executable)
--- 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 79e01fb04f067028ff1bba256f718cd3a9dc1e93..8dd9d5246f9eb798ec7f12b0c064c5f66c991181 100755 (executable)
--- 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 37dc8ffac57eccb0c865eef4b3eb71e4a6e4bc83..b88fa55361a5d4db409985fd1ee3d9cf6971cfdc 100755 (executable)
--- 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 464a2544ae381db0ecb73128d3225a4e24340be2..b6dfea14730f42011b2132ea36e678af34458aae 100755 (executable)
--- 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 add57775bd00d345abd3c1b666714114e2bca4bc..6eec93cae6dad29a4f2d1b1bac5e48feedbd707f 100755 (executable)
--- 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 89e971c5fe030e639f8219be6ddde9b783d6a865..7bfe4eda6e719fd057f846c51ba2889eebdbe3bb 100755 (executable)
--- 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 8421a989c6b962916a0f038ae60e9325c2c2ef1e..3fb4702878e31028f59e231339902a5e8d95edea 100755 (executable)
--- 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 e0c5e36a962d2143d8b7e96bcb590e4da58aaa23..f11d53d7160a7f2938ff57aa416917bfdbeb1d4c 100755 (executable)
--- 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 e2d33fc323936697ef4e559b12fe2c6c2fc3075f..e6f91c708c8870b67d074aa1b29be3db444d0c71 100755 (executable)
--- 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 3ad43b403f66b7a15dc3edb6657d9662bc69a036..59f3cb7b46bee508eaba8a053a2088c920fed8a8 100755 (executable)
--- 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 85603b4299832f9804febdac0cb101b5dcf0fd35..7ea8a0951f4c4204c833397b68994d9ac75ce3cd 100755 (executable)
--- 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 c01149629f1dde5eb0884908b4cc5d47a6b32f88..f3cd267412d58184183d8860f4b757a1d079b62e 100755 (executable)
--- 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 914d9cca4b381b4befb94bafb88511d5488cbfcb..859ae9ae12424e45433170444d0b9b4dc54b96b6 100755 (executable)
--- 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 fb5e4358c58ccf38081771e15e1e7a17f80e2314..712737b1d5f94f235ad22cb6a7661c8eb97ded1d 100755 (executable)
--- 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 6908462141d653b8b8c357dbd7f44b2a0f9de960..94c1f2a670b14d17496dd1a85235d178d15a9eda 100755 (executable)
--- 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 c1718dedc19d5906e314e6a5ec9741e2e5a5e4cf..33298e69914380e21717e69e730a782e9de1af1f 100755 (executable)
--- 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 8a8b4806947d092f9a7be914493558dba2f5ffe2..301088c0bf367930547823bdea34e88c9f891a22 100755 (executable)
--- 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 3a241d0587d667f1fe769a92d9d5a6e4b419b2a4..c188284a5cdce2bd8c37796e842e0fede2a6ebc1 100755 (executable)
--- 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 f2a2dc4389372f5dc37dacd693687425356de773..cca2350c4310be08c906b67ab9045836f4703de9 100755 (executable)
--- 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 bfc79562d22ba153cab5e42300004acafb9f9e77..d5e744bbab359ecf482d652b3ac2438668b79bd0 100755 (executable)
--- 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 8315a6254517457648ea9ecd1854877dead57edb..36f9d094f5f767bbbfe7f5a52a215d38c7d8d36d 100755 (executable)
--- 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 8e86267fa181005e0283ff452b11b60fa495df1a..5902fc605e54f2e2158aa011ef4cc14c892db3ab 100755 (executable)
--- 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 ad7bfa51144b0a9b030cd9772728839af0bda6d3..d775685757425264edd8af66660eb60c640bd446 100755 (executable)
--- 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 22100b5026dad8c0d91857e9a6ec94a11f9a4e5f..5e8f2c92c1118d3cded10f09130606f8720477ce 100755 (executable)
--- 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 a11bd0dc91cade36c88b7854f42f033c4869b7e1..bf08321f0d584d02e8d737d1cfa781f52a62bd3a 100755 (executable)
--- 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 2923a474eaaa7797245449fe2be1798218ba6a4d..abddfe22cec238b75ef59fd0f01b24998ce51380 100755 (executable)
--- 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 18050a3afcde64428d6fb71fd8e1dbe44e1c7920..156987f90bed5136aebac9bd565c0268b04fd136 100755 (executable)
--- 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 499014184d193936c3bbb03a7102761bd075087e..ca8db2e8688d8dc01160e30f7507da2c857f3436 100755 (executable)
--- 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 f1c7bc1adf0783049026c977bb2690cb0c6ea2c2..f048eb160136ba91ba907aeaabef160c2206beed 100755 (executable)
--- 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 cd763f7dabf11b3a4f22d296336fc2e13a6c28ff..f6a77a1362a18bb04c652de49e8534e1aa2ad518 100755 (executable)
--- 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 6b3b60450d5f850f44c9f156df0dbb7abcdfe1b1..140c7ee1f63cd41d60e2895f4e13f52142098e09 100755 (executable)
--- 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 3341d1a8bebd487768bf2ffa7f9f8c4536b1f8c1..5244a852a3ad3af0b1e9c6cee964979f8b0f7f1f 100755 (executable)
--- 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 f0bd241f93c832878787fb73c90adf1c08aa4a15..89d0602892abdf41e9668ac33ce5350744280770 100755 (executable)
--- 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 f5ed6e60e2bef8f4d16a429baaef8ceadbbc60c7..2a0c04876d5a9dc2ee96373b893c1afbbebedb18 100755 (executable)
--- 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 d575ec85154b71bb512eef7957b256784671a749..794d3df04c42d2a3b2674ec3bef906bc2aee0902 100755 (executable)
--- 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 fe5ad42c925fe004821af33dcd28d865870d97dc..c4f9774f5c757fa2abbe3f118b6ea26b70e4e181 100755 (executable)
--- 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 f0d1a9e9b13936f9b40cdf79d17eedc1ad7ac94d..6be72cff0fb9174b73aeb341ce48c8ff8734f34c 100755 (executable)
--- 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 2351589a799483021f80761f09dd419e5133cd4c..0ccb911c357da1d9cf0dc6138eae1f1f3c5a0e49 100755 (executable)
--- 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 1053b3ef76f9470e2db58d2730ffe05d8013fde2..d648f34705a320c107fa413e98f96653efcb9955 100755 (executable)
--- 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 82dd913ac516af35158fbad72f7818081dd478ec..62aa80bfb65b70f865b03fceaae4a549be55f245 100755 (executable)
--- 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 b6374aecd92d4a8406ddb573a327bf7db03d0fe0..fd39340bd696633e20d92db01b5b51d5946d3961 100755 (executable)
--- 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 d7565df3b5c6722b8f8044c91dd9c537415cb005..5f3e0da1a79afab07d193f6808b62fc94aab1e6f 100755 (executable)
--- 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 6fa5293c7ce0caf3b767eb2682f6b49307e24b91..a25cbb478a931892626649fb53e334b5807d156c 100755 (executable)
--- 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 5a61b7e8cf11b164c6003d3eb23db28f2df4b46b..a2245f29fd7d2c43eea96d67c9a9d143e0eb9719 100755 (executable)
--- 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 2bc2a6195302b62d6bbfaa14f89fec4fe62dd048..3525d00ca3cf745fb1a004aa80c8aab1c7e5af77 100755 (executable)
--- 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 ca28fa428564c9ae12252c2b1d531c04351ea4f8..397b91e493bc1270da207bcc2a28bd0172a6847f 100755 (executable)
--- 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 7d9dfd8e424297574935dcda51ab5f9949258477..34d6a4e1b6da310519b502e339ece459522b1801 100755 (executable)
--- 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 7d61ed25bcbc6f5f052bb73cd666ead7e7f00287..de24df956b5dcb8064a630f4b63c8aeba2589947 100755 (executable)
--- 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 a330584c10c476075dcc1b83b35da209e7d5bd13..6ae8ce43a20e07909ce5f32a948e174bc6cf0379 100755 (executable)
--- 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 97b5b2909696a657e09e5b1d2df8b12b511d7a39..873ac2d405227b39626aa47cbba350f258c9182d 100755 (executable)
--- 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 69e0c95113853ed028c748bacf36ccc74ba28c41..4918a3597b85a5efbfbcafababb469c11c1ef24e 100755 (executable)
--- 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 60e226b27332a5784cced8e6783a18ed5abcf7df..9391a9a4d936712d1f09b614323c8ea2c0b3c416 100755 (executable)
--- 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 f09e499fc279796cd31413e13ed601431cec13fb..d468fe376d0424518aa02ed5844d2b20c4bdd656 100755 (executable)
--- 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 6c0b13734c633d2cc51d67c759d70bc4a7bbd661..79875b205651e52ea5e44dd640256ee9e1e795b7 100755 (executable)
--- 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 73e4f6ff7958dd25d5dad9d52fd770e4d45a77fd..ff07bb9f5fd9ec38075923c40bd527e38407eae8 100755 (executable)
--- 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 dfc9b2bf0035538d35fe963afa246cde458005f5..a104dd66ab285885fd7c0a163ded7e07ddddda5d 100755 (executable)
--- 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 592dda2a59d583f1ce2a5ab4a083d9259f2506f3..4d87d35b4103fb5a474ca0a6ce5aee79b247cad4 100755 (executable)
--- 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 1381ce68c98050b13366fece9cc5fe1d60bba55a..8954dd849bf7ec645655bd8420f418506a4e1871 100755 (executable)
--- 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 92be45046082e58e6a9cd3727251685ea683930c..54727a1c7e7ef1fc5b4f443048592eee45b17934 100755 (executable)
--- 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 75c08c952f4f2d264cc7b1b51a5202497738f690..deea889bd478e42137eec797b4702d6f0bfb41c5 100755 (executable)
--- 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 c5d667c8c770632fb99e6dd6bd14cef954160de4..f70ffed58233ecafe72c4698967130c8fabf61a9 100755 (executable)
--- 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 762671c274862b9ec5dbba373c90038c212e35f1..a49f1b31b5d91f538fe95ad881c2e8a1e84deb2b 100755 (executable)
--- 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 605e964f7148bb7246a4b43b7a778920748287c8..d8cd27ae7783bcfeed9c9d3f0c3bb9b1df3b06db 100755 (executable)
--- 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 4897e10e1c9367b6a4e9bfd65346588bce4aab28..a915f42392ebfe89fa71d4b42ce26b077670e9ac 100755 (executable)
--- 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 fd7b7470d7baf496ab0d25fafd1c47a6dade207d..2b9e941567a80711d6a65c6f2f874f24e597341b 100755 (executable)
--- 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 2d8dc328e9d27e8b31c4b1fa8735d6fde27143a5..29a203275bae30c111ac8ec8a8eb58db15e2cabd 100755 (executable)
--- 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 abe85bcbf5b137ad97d7dc60f62047d23f84e8cc..fe17c0503fa24664a98fc2099b63c2cc49b37154 100755 (executable)
--- 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 5c987600294393d15eaf305433539a6a3e2317ed..a54afe493d578daf559d44514457027b0a852f84 100755 (executable)
--- 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 0021fdadce6e52e696a5ad48db5fe4cb6928f25e..da3cc6a483944151fcb040b9fcd4f496ebd96e85 100755 (executable)
--- 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 f416111ed85b6f8696f4442b61e53b2d63dc17ae..ccfa67475b81e0ba005749b11eea7cec7eff515a 100755 (executable)
--- 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 b96d861c84379a089b526e49d5dfa83e05d322a0..3d0f73e9c4a0d7026d742f414238dcadbd724ecd 100755 (executable)
--- 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 0dbf4854e1f71a39cc74dcee1fe1e525b2b5018a..17f506219f16d974795618ffecef74736ca8dee2 100755 (executable)
--- 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 1743b04480a0d1de53f726eeacb24d6b61c234ef..49bfc47c4c67607d4aad9b7a57c93d35ce51e78e 100755 (executable)
--- 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 d3295cf68360e35ef8f6d8ab146592e414f73f84..06a489fdcf20697ef822fa56f2ab81bf975dd271 100755 (executable)
--- 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 728ce05335b3b6cdf67308170b92df4fe8a7221e..a9f00863fd2cc3a505e2786d530567343af076b2 100755 (executable)
--- 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 68a7e2245af9b0dd2ca79b98302a109e376ea71c..576342f3faa9a6c945da31eebfd7d2a9cf83c67f 100755 (executable)
--- 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 24242815d37f28e1deffd578d4845f332576cc6e..482cb308e5c339d648986fdbdd1f64aab0830c9b 100755 (executable)
--- 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 0be254c784024643df99c506f73307fafeef9482..78bdaf327503da7f738dfe7d1c77f28175907713 100755 (executable)
--- 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 a1656b2174046efa2dc0c19d828d2b09cd34a622..264a3816e6861cd60cd98a8327117b5f9b3ee979 100755 (executable)
--- 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 2b38e69e7bb67732c1fa971b2874d59a7ddb7247..1da08bfaaf622757d7570a044a25f9da4331c961 100755 (executable)
--- 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 391174a3d67254d24fe706601db7476c77802df0..b3abd4802ce99aa55f9a4a8e0562a15aac247101 100755 (executable)
--- 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 d56bc753e8d43c550c813352c47aba7dfc760120..c3e8840cf27ba0104fbbabaac1ec681c33b9f0ce 100755 (executable)
--- 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 580b527a4445400092fc178eb3e42f2e1a59c81e..0cee47d948618ee5357a4079f3f75ab3985888c0 100755 (executable)
--- 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 bb4d7cba1c0af41ffc05c22fd2c5a338574b37c9..7c02b41a576b239e1b396717d923afc566d21367 100755 (executable)
--- 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 bb2b165c500ae41e6abca5d0434a191a5bad9eef..a50a4518db52ba4d53fc1521b7d4f4bbd187d3b9 100755 (executable)
--- 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 3434e3ef3e2a0296e0e758ca132605d8807bf780..daf5d668761aad924b829ef2b8b1e78c38223c03 100755 (executable)
--- 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 092ea129226ca340a4294073fef1a1fc1c6d9056..1340c7641d9b72336d6b71cd2cc49a5f061bfcb7 100755 (executable)
--- 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 70549a80da5a6d8ddbde2d7151d9b552ae009163..a054a61bd74275d7ca48d4a79474515ecb8696aa 100755 (executable)
--- 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 ed544b09154e74137be9721cc4fff0554d8a1283..4c71f28498f6328226850fb2da8d44b71c3de064 100755 (executable)
--- 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 90ff71ee0eba368b50631bb0623941aecc9146b7..8ae9aaf1162ff40b1e877ab7b0f986e2128189d9 100755 (executable)
--- 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 6470f5dd386f75da19187028688c58d6c203d222..5e07bab00b6706b841fa06218ef6f709d0d3d46e 100755 (executable)
--- 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 acb92a9a602d90b6c5c5d28399b81c091ab37ce7..3801030bcaf9b7e3a02c7bb42bfb402afcea8bd5 100755 (executable)
--- 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 b7cd17a2285521c43ada08e39380ad5c33c06f58..7c43703c79cbba4ffdbee0319c4e40baac062ddd 100755 (executable)
--- 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 ea6292c792456bc714194e266084cca516c70089..d9204e82d7d5adb58859719c30693696ae073cf8 100755 (executable)
--- 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 a36aa1efe6a5680089661d2fae1133455e1e9e55..744c4c18c041a66548999fdf18ba3d1a74eca055 100755 (executable)
--- 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 8818c7359ffa54f4c057bc75ebfdf37d5e01090d..d203a0b90931cd29b09610904a0734b7536f9c6a 100755 (executable)
--- 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 71001d9d97c1da55af4417b1e4f400f3de89345f..e54c2e114d55be12969713fb63eabefbfae02d30 100755 (executable)
--- 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 3092e9249d2b19750c0e149291092e5f426d42a2..58bd5bcaa307b5c15c1db60efc9dfc00f6947d84 100755 (executable)
--- 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 f07ba94931d07f07bcfde41140a38219d594c37a..17e9428f01a0a3c3286c99c45be5f9594a2a3664 100755 (executable)
--- 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 3b3f6ec715685358780a4f772d68a15e4753e00f..41af2d90760e3a8b8eb8ecc762676eccfafd08fc 100755 (executable)
--- 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 a78b738ad2d09be41e942e508bcfc920cd5d5e94..13d22fbed9d91ba1ca01f9aca900f46dd9bb6683 100755 (executable)
--- 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 de03890f4be7151fad1b3420c441e1a01ac283b4..994f42ea3644b36517c045e0b47bc15ebbb49b10 100755 (executable)
--- 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 189abe5b82112fbad6bdb552094c9d0b253d1bb1..4ba8f3d18dca28cc276cdb69a84038866a7c6893 100755 (executable)
--- 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 1020da270bef09d285e3671c65f3cc93da9a663e..e07bb3d74c6dc4bea2ef91dd3d8ccb314114d42e 100755 (executable)
--- 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 1f1ebc2d51638190188900502cbb60e57ae5aa8d..e5e86c0077c076448d3c8c08487dfd597b203628 100755 (executable)
--- 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 21c22f480b73bd4076bfb5f7c98672e42ec54926..8d27bdc57e55e5eace31d5659c58e803a8cba592 100755 (executable)
--- 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 200060ae86a4abf6940e03b98005de7cd849875a..588ec6d0711ec359b8c92d13794e733ea2f0919d 100755 (executable)
--- 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 683ee4e9f87746a12ec19f256a1f16ce508f2fd9..383c164a11802b7fe69d295c98293e96d2b1fd73 100755 (executable)
--- 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 b691ae75c08aa2151b4a954ac0bfaa909e066fcb..9521f0ddf477dbe71a27e1d0b4ad3fb93a6e030c 100755 (executable)
--- 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 9d946a09b56b9e4c463af756f1f9fef26ad0ea04..113bf6ec352a748618bd609fa55ac8e6f3454d50 100755 (executable)
--- 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 f544df266a845f4322209dca2278a83ebb9a0512..d34b8f3902fbdf6c37d842bb10201b255775ccb5 100755 (executable)
--- 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 b59426d83577e62fca0d0247551e21426c7481c2..c961cc94169701fe899bc8359ccbc291f92979b4 100755 (executable)
--- 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 07a8cd433062d7a193baef96588317f64cc2ed22..1dc68d7766b0f491a5f747bc7db3298fb4e3475c 100755 (executable)
--- 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 00e49bac921484f0486ff6c77931b6c848634444..0c06ded1d72e4627e59e128e004bcdc9d6de874a 100755 (executable)
--- 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 be89efcab989bdde3c3aa956bdf3ddd6fe3a9df3..2491dede50a4201355e85ddcc69fa930c801042a 100755 (executable)
--- 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 08ae0f8b97d3948654e465dfd32a5f6eaaf9fa33..7072d46617832e8447ce35fc637b3223d7b59988 100755 (executable)
--- 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 b35e527d4112b9bac9c3d1736728f241deb7e715..f40d3b04805391b2b05518b3011ed540a1d43bfe 100755 (executable)
--- 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 46850e8839692e50d8ce00a93db9eb4cc939caed..78f30a005ebbcd90bd69ad8995bdce09cb7bb894 100755 (executable)
--- 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 6b4f368d23b2417997e5970168b0a0e03a5c04b5..e54c7ae55777368e3d04295f476a0ee4b9e3e727 100755 (executable)
--- 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 288688b35787eb87436196daf3a1332476cf714e..c86ac6a28e4499dc9e9a8e3c1e8401a8e1fd9d2c 100755 (executable)
--- 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 c826202699b89cd2502cff6266af7f1a837edcad..47e7471cee80342ee3eedeeae5086554d7342b42 100755 (executable)
--- 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 f0dbb96ad2b92f3fe929934ee4325cbbbf647acc..f7b9d9665b92c54f87221f35ac633bbe736a5a3c 100755 (executable)
--- 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 9a38627c929c8d5af540c2cd5b0b0afe7033365e..8c17eb455654f6c3e94f29f3c91c6bddf5851230 100755 (executable)
--- 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 a216249d10bc9f5b2bd4f237597c18b04a76348f..06cfcbbdf06f0f2a960192f43246ba005d7a8fd4 100755 (executable)
--- 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 bfc51aad35d3c64cc85be3821d8d3c9b4764f7cc..ad30920ebd2e5e0f080d55e7c874efcf990b3249 100755 (executable)
--- 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 e7feba55265fc0c94b142df7294ad48b27cbf8bc..8f65bbcafe8bc9311841bad5f9d413b28a83874c 100755 (executable)
--- 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 f9b6bb59f2572d8b3c520842129f99f1b0c1bb7e..5aa5f1e717696b0861e77294fc87040e7e7ed944 100755 (executable)
--- 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 00a08140dd50712902564bb125b0f528ca348d18..bfa1aba6eeff3bba332ec64c357ea6416ba1c49f 100755 (executable)
--- 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 9db9ba61d24387d95943177d9d5cfd7f6bb64dac..578cd44bee171431c648c232d09435d44ef2f067 100755 (executable)
--- 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 ed6ef625f7ca9a2c81e33d0091df8e9cce99c639..e4859f7068fe6695ed1ab9efd4dcbde3bed5f66e 100755 (executable)
--- 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 462919f57ec9624d761cc67b23d7b720a594c7ef..a6a209f4fdf74357f0f82076426d2e76ee106ed1 100755 (executable)
--- 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 303c4e268bbe9d4a31f5f8cd441e896f27bead58..0d9fe349c74377d12a43802ec8975ae1cdbf65cc 100755 (executable)
--- 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 7214c25c8c72f36d3a5b4c0d94c03e7cfc83d6ea..e29dbcbf908f10bce8e3f1d96370ba2d635fa764 100755 (executable)
--- 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 3aefab51b8ab1dc618916ffa885c3b7b28f9d6f5..cea296bdd4cc8d3e5be90ca1838e61354ecd2bd3 100755 (executable)
--- 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 4daa848cfc1b0f1c6283c8e7d20e4495c193aad0..0565252574b1bdbe6d71599e6d9d70d587822435 100755 (executable)
--- 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 e671f7fc8c3dec6d07ffbf908556ff3d6f680b87..cfa903dd5b8b29890e353d74a4796b85303a07c1 100755 (executable)
--- 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 a3044f70b5f8ea8a447212e4936e4fac4825631c..b7316684b597bf7deff0a5b9abc5d097dd3996da 100755 (executable)
--- 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 e236558dbe8abdaa3ace6b93ba93812b70d93738..b4b4023cea641c71135db97c49d88a0d36f9717e 100755 (executable)
--- 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 98c704c143978c270913e2469da7b6d804d0832a..a71d87326f10e4805a1301e297c55e65cc25aa81 100755 (executable)
--- 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 259d514ca69a5940261e99f8c3b00519de678ba2..4612d151351b208b38984cdf5972ff81cecb9375 100755 (executable)
--- 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 0e7f8b2ef29148a00a2b4c6088bb241f48b6a799..5e754f437694fa3ef8edf68856ffe4691ed318cb 100755 (executable)
--- 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 a9f19a55b4ee5237d80bf0ca9e0363521157ec32..e650b3e948d690758a21713307470fccf79b703c 100755 (executable)
--- 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 22451c53afc2c1ef18fbb25afec52f849c3f53c7..d30b7b2bd43e3376e8624ad2ae1ec3ecfc8c987e 100755 (executable)
--- 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 bd4e0bc7ca77914f6e10019f6168668dd1e555a5..c7be272081b65cecd6db9b722e30ff1ab7ed680c 100755 (executable)
--- 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 11343a1ffb5a2d4c0b1abb9efa9fce0a115cf949..1a20ffe1af6c7b1cf95c45a28c50a5ca9d0efc3c 100755 (executable)
--- 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 a8e1fa624cb9b5ec79097bb317cb50ae1bda38f4..a802dfb7767f8957d404f4cc6f2ac2600d801dd8 100755 (executable)
--- 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 3fb98e5727f7bcfc2f01d068826e420313c7d916..89a5ea78fe67a8bab2bdb649d1fa26bc7be9ddb4 100755 (executable)
--- 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 ea4b94ac7ef1efa0aa96c8bf429c3ac8a3b529be..0fe37169128d7d012b94938674ac4af8adbc863b 100755 (executable)
--- 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 ec157a26cf71208069bd5e83c4eaccea0fa5a964..3a131bf81175fa1f29679e2bcf7f0857c1990173 100755 (executable)
--- 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 70a0b45e83daab44d7f790dfd390c7182ebcf03b..7c46d0c945d99788bd737a565849b8210339add7 100755 (executable)
--- 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 8d5d00a276ee8857ce714a8b106baf701bd460e0..fed1c23f2149fa8c4ed7c1305444703157ad2dd7 100755 (executable)
--- 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 8e380944cec1662d7dec665f932fa15550c302d2..3b980ab023e90837f27d606ea464169bcf1fc70f 100755 (executable)
--- 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 8a6eea34d16a10d4ad7b7f13ebfd9d3a9367c9b6..0f67d54c4b0e12b141a2aa5aecfa3d4c4e605f2e 100755 (executable)
--- 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 721fb8128b370813dbec8955fb4c4161c4351614..9e6c89e4ab2a84d7fc6b59758c4b208ba9187c87 100755 (executable)
--- 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 fdbc4c202547b9df9e3fbd63f316be30a8126203..0e873b18e1e0116a06426bc63e311e6a96360fc1 100755 (executable)
--- 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 049ed0f72d3a18cb607377547ad666b11596d440..15bb8bf456c9a0a176cda83fe7ea8626424311e5 100755 (executable)
--- 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 939a9aa620d01ce0af8e5e6de9dc6779257a2654..2948ce23e9c80b033ab04f4b09f6433d7e59f525 100755 (executable)
--- 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 6c8314c6be79a45364f3d01e05ced4c8333ffc72..b81fda6110716cedb9e367a0d413205fc0826206 100755 (executable)
--- 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 81d0a40deb5259cd5b05e7f0c2319c86f6dc4e9a..36fdde5f2bddbc3d2ced168a7056f683a6fe217a 100755 (executable)
--- 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 9d3d76aa61834a3fd6374f94096986af550bcf5c..c7054c5f4c9a5caba2e23a712d4415478618bd25 100755 (executable)
--- 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 424bbe043be8f5097639ad4947a52f097aa9b4f5..0802c5ca971ac442c0cf5fc383f564dff742b593 100755 (executable)
--- 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 1f12c9b96a8d66458084e312873f69b63ecb426a..2af66fabf6d23806d9984a0ac2fd64c9c224000d 100755 (executable)
--- 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 6d09f8e983fb38851961134e9faedff78e6087f7..958f9568c3ada29a372f7f5a844e6c431891fbc3 100755 (executable)
--- 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 0aecaf05b6c8e1ed63effcc264e0ab92db5860f1..665ab09c8e4087e9f76f192515f110e055961a21 100755 (executable)
--- 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 d9c9338002eea63b1cadbd2b22d184b3a1448f3d..02a6966e748d598337cc7c9e2149fb203d682adc 100755 (executable)
--- 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 ae32c9c295921b1804fac1136e406fe075da34df..394a94a5c4108c9af29b32a7e7f219cdfe1c9493 100755 (executable)
--- 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 637c61d137e3f8eef5bec17b5a649403201f5a64..f4025bb9e2bf64fa0087b6e5ec9d5a836f692e0a 100755 (executable)
--- 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 ab66fa12a976403ee226d74aea8779d1ddd8c846..7492a9d0e521078d89ec7348ed2deebb55da568c 100755 (executable)
--- 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 ee20df041261926710ad6c59ee989180206b3c6d..9cbc78d8e01b6afb21533e33f6b811d0bbc01a3b 100755 (executable)
--- 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 e07ea82db1aaf18ef796584d714de44c289341a1..e687ac22cdbe00065ae8a4f87226899b0c2de35a 100755 (executable)
--- 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 2aeef77ac8e61d7932524467051550dfa00e1691..a1a8e1d74bde1e222863038b0eaa6bfaad47c436 100755 (executable)
--- 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 2298553eb8c26de375531d65f3ffbbe55d4809f6..a460785aba11348cccef65155a2f169e52557e71 100755 (executable)
--- 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 0e2423cff230609aac84381ab3193b721981bc5a..8f0218db01c6744ad553807fd655cac26c5cb2f5 100755 (executable)
--- 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 e612ee0bc87e3d6b632fab1c257784bc5733738e..b828c84b57dd8c4a8f2cf26469d3da1ccab381ee 100755 (executable)
--- 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 135534454a542a9e53919bc01192e676b8573531..89fbc18f48a2c1de0433473237a8919d488d1527 100755 (executable)
--- 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 bba07604da936343c01136411c01d4ca7142113f..6692d0b6108b68506db2ee02c406643a0918425f 100755 (executable)
--- 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 e4b8adfb31791e1ab04165aa50923613cae0df0a..95f2c488ea4d2dc535619cd860d417cc6c0970ae 100755 (executable)
--- 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 ee65a7284beaecbe979e95b27011a8e9425f1f0f..98710c1e733b944d6cc0d1e4fcf74107c98bcd99 100755 (executable)
--- 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 67668a135a73f0ba055844f4ff70919ac75ec996..40b8168dac2e5471238c3e8039b4bfcc9e7ef299 100755 (executable)
--- 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 bd6a9b88b5f493b41570898fd93aa60f9899c324..b818a936b187fd1919e73cc5ef774ed24d532e79 100755 (executable)
--- 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 89a40849054aca4435995213082b9f395dc38190..1ed50952f0837ec838f1355a17893d3f7ab4fb89 100755 (executable)
--- 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 c0fb2eb9164538c04c4337f46f5ac57de5000642..c241b5c8a77e857d397ba77eda43961fe7af0804 100755 (executable)
--- 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 07169e3c6f8faf5758b36814aeb38d618e1629b3..8fa3bc36604882a9091d28b8c55c4639f89b0966 100755 (executable)
--- 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 e659febd01c718bed5681a93081a9dcec615010b..c58b8a2ff9e8fb13c9d4419896e7b6c6f26a83f3 100755 (executable)
--- 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 e6a07c27b71e34d54797b2149128587e83a842b3..1e7c513836e93f13d9dcc6184c1634c277090ca5 100755 (executable)
--- 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 27269e2dbfb94e5ebb799a031394d77d33313a6f..d861b9291130d7f74c5f98a610c2483d8900b6fb 100755 (executable)
--- 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 ec1941691a7d96ad8a961a04ec2fb1422f04705b..b0b22e4c4ad0539cc15fc2152b65eab3304aff53 100755 (executable)
--- 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 2e64a2c93324de5bd59c220f0fd2e9e3a8b09e3f..8967439e847e2dfeb8b20121ff5e5e2e0cc1c515 100755 (executable)
--- 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 e584df02a4f8534f1d68e7809d3776d45a43f102..3c84787062366d7e8799adcba3a2f374bf5f1d30 100755 (executable)
--- 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 5e58ea46ac1027ee6af1f28e978183fd23c97ad6..b297dcff565d70a77253ccacd05abccbf0eeac44 100755 (executable)
--- 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 2e0fdd29aa5085e74c3541b78ab381b2582b2e93..19cbe7a6731ff1ef84c454645ed129fe83e29a67 100755 (executable)
--- 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 039ce50407f4edfd0d33ee39573f1c31942af1ef..c83e1b4b0bfa8484e059be79adf31bd35377a32f 100755 (executable)
--- 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 cd215964465c349841b07578d59509e30ac8c643..de9030c8113ad2025b68c6c46f72dcd5ecbfbd4b 100755 (executable)
--- 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 4f0660f22058c836fe2f7d0b446314bdf823a4ac..016fcb13a5a6745a7e19d2704c468b99483de7d9 100755 (executable)
--- 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 cc1d933a306e939fdd2c4270a5af2083f4ccdce9..6edab5c6790cbecfa0a3e2402987b10d9925cc07 100755 (executable)
--- 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 d80e3d41392717853d1e4c10600dc9356d660cc2..b15d855fff4244e5640814fdf45eceb517070e07 100755 (executable)
--- 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 ed7fede977cc378d66880cde02fce46a9424495e..1520334486435e63e96f6438f9f481f9596eb6dd 100755 (executable)
--- 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 e8a0c5ff5343ae68b5f75808b18619fcdbec1f6f..4e488806c80fb861cc8de610f41235a27225b606 100755 (executable)
--- 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 5465f213a24025eab3cf94d2b971d6b2859aa784..e8e31fd24847b305275ffc0fe9c8a252c2b36d33 100755 (executable)
--- 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 59dddc83e9db8c5d0e0ca61b47468fe00464ab89..b13cb5cf1f98fe499fd79e3b072406f9b61b64aa 100755 (executable)
--- 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 9562966ae9c5407705ac3584ea9a4c6e63bb683a..34dae09723b8fcc54459f1862fdbf6a3525755ef 100755 (executable)
--- 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 e72eadeef52108b2154d87ccfcdfd0b8741594fc..bc85e0157a766f56dedbbaf0ccf87eb67eced4d8 100755 (executable)
--- 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 8c92026138d80e86639fa42ab8cef40cba8acbb5..7905f667601edc3cf7e2efee967400a82bb275d2 100755 (executable)
--- 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 c5949e62b8fd39abb0481e59deeb28017c554561..37a34ddf4b5c9a54f25945bfd75ae45660c72d44 100755 (executable)
--- 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 14c6b0ea06bd64c5f1c0bbb1e0f1ec1883c9e5e5..0c2acc606524369bf9ad489ad814c5f8952eb861 100755 (executable)
--- 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 801b55d17b2b72c43f80e8bd10dd6a56f8e43d6e..83c88e1d56f3dd37778b315f92d85dba7cb99e0d 100755 (executable)
--- 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 cc94dc4bccf49d3dcbe1d320a7ce8497b06ee6da..c10e959b14d7cd34ad47152b1422f457c09cdbef 100755 (executable)
--- 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 68a3842365f23e6b939abf2f21b507252e9225c6..d6c3b3bcaf38265e7f6820e21d1615167bfaccb1 100755 (executable)
--- 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 469ba5e970bea2a4565631a447e823d981ba68aa..0c732a7a24c3c945f45d565718e1b46eb6507d99 100755 (executable)
--- 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 c5a87c2d074243168c807a3d5effaa90f2ca4c18..a84b0d55c9fea3e298bde5f9eb77a56c15ff202c 100755 (executable)
--- 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 991c1c83fbb6c68e6346454383705da29246e2cd..a5c67501e3230311b8f2c24b754d9b18276cf7a9 100755 (executable)
--- 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 88aa63cbef5df7114dc92c5ab983d1509b8fee14..9ad4d6a175ff97a8a29fe08d6712a4493e9e067e 100755 (executable)
--- 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 980ebffaba6ef7cc88689268a6a890b47d060aba..858c9d3fee155eb087ec3778b464035d5c255695 100755 (executable)
--- 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 a82fd9c3215cd48c7b4bfef708ad32ea4930babe..5e57264dbdcc9c2b8f56694823f3fa6e1a93bfa3 100755 (executable)
--- 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 7d3634e957d79faeb7e151f0b6096ad1c504c944..5eaccc947ad48c3f5fac7afc258374bab7808072 100755 (executable)
--- 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 fd809f5f2f2dc5fcfde5f2e4725990ee9b9a8576..159da943ca2334ab638c7219af60a54406dd86b6 100755 (executable)
--- 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 9c8e8a5d8ddcf3291760091fc517248b48c33fdc..060c05af89ee5d5cbdf5cf9446b3888f3d0e7421 100755 (executable)
--- 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 735d7ad08087f92a81848a537bdac44715154e25..38c0adf569d617cd7a124af32af6759cce55388d 100755 (executable)
--- 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 ddc812e0ecbec68dabfe484b7a860fedb39262b6..bcfcf95520f04f8fd01a5eb1eda505815986823c 100755 (executable)
--- 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 fba112df2895f5658568809199302b6b8b9a80f9..6f3d3542d43a71977340fc2d8b1e24da55bd5066 100755 (executable)
--- 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 e2cc9c93f954a91b4fad73dbfbcb5c05c2222b60..feb0738378216db45dcf1eac6fbad1542e97afe2 100755 (executable)
--- 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 aeae33da9b2f0757e4bb3909ce90193693f18deb..d4a5536698f220d54b18b0ec379f44d0f4782e7d 100755 (executable)
--- 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 951b6f9e01e860e3cdff1cf3395cadcfe8a463dc..56e106d44be4a1726afccd8c5015d15b9db50d4f 100755 (executable)
--- 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 0cd0a5581126f6fde4c153e5064f94559efb7067..878e465097497a7cb72672f547891145aeccde0e 100755 (executable)
--- 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 7ed437021db05820e48bb0df6a00df0478d67d8f..cea2081ac03e6b8b6cea579d36e1385800d47491 100755 (executable)
--- 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 ed72880c741a55d180ee85732425e28ce9888b57..d23c89b7c7067bd0391457914e4a7bb637022e2c 100755 (executable)
--- 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 2c8ac52f4ea70eab76382205a7850b49b986738b..85de287a349a0f966e84512563c801b3a643a371 100755 (executable)
--- 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 5df2d60fd0babfc677f41d9bd1ffa8914284322f..c75e62bb497c1c4a22969080faaa8a4f56f94e66 100755 (executable)
--- 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 4bc0e73fe1a4fd5e74af2c98a851d8d86070f4ef..947f6b0128b21e9061576ef9831dbdaff9792502 100755 (executable)
--- 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 a96edc680a1905d7fdc9993986532ea3fd20becf..c577883e46c2370390b8975f3165d67427efa374 100755 (executable)
--- 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 fe5c6804960398cf79f6d9934a4502ae233c1432..9145b008a24384a4da455e4e5b443309403afc1b 100755 (executable)
--- 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 d32513d9b556bcecf72d4cf1c25749e9734b7c4b..5a31c0be52597d91034a579600aa27d9ef874802 100755 (executable)
--- 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 ebe2a673f8d8a4dfe57d5f7fd9820c8c98c9058d..9fd125f0a787f49f46ab1faa5e869e9b0acb28c7 100755 (executable)
--- 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 de7770b5d0dde58e5985b12023f564152de68df9..915a0fbc5a0ac58b455e5e2f8ba609e894c2839d 100755 (executable)
--- 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 708efcbf4523109f60df6918cfe66b4ce2d50c54..08c5cf7506f497cecb6bc2e539ed178bffda5978 100755 (executable)
--- 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 61d71c1faf26497c5c8a2dd332127fc8594748d7..eb69b02e7496d678480c281c19a3c7c69cc79393 100755 (executable)
--- 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 b22969eb468907da0081268b8f5cd92052af0824..4764640908fce784f9223d739af0ad226bcd1379 100755 (executable)
--- 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 3d7c6abf0d76d5cd9e65f4dc114df15020621bab..b03d9268ead7c142b461463cd86d551785afb7e2 100755 (executable)
--- 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 8c0dfe0fa47e27a5e67c5465c38a3be89d87a692..5a057b42c6e75f78193f8f9d658eb62f320cc8e7 100755 (executable)
--- 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 fededda975dbf327efe9aa5c2878a5ade2479c4a..983aad9452d36852b6419c1d6fe508b44fe79bf3 100755 (executable)
--- 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 d5d74656194d9d8f6d0b2540c5f912cafba06033..72d0f11619cb97e6c93e02e0265b7b8e1be21429 100755 (executable)
--- 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 e73d4b209f1c071d3ffd4906522c6af632953352..bcf3fd91002a396fdbb2bfba24453fbe1f5f0e09 100755 (executable)
--- 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 2d7630109569746d52785f6262d384e74a7ef43e..471765d7f0598723d9e6d4aa41b080e260833141 100755 (executable)
--- 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 2c28a2f713a69657ad751a8cb3cf3eeac3a00435..42786bd10a251fff992166b6533490510c74f228 100755 (executable)
--- 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 c5d1bd5c4cc749d4a419eea0e13abef55aa64175..1bd90e06519b4cdeb3b5b885d1dccce386eda197 100755 (executable)
--- 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 8a506626cb2cff66a1b0a48189432a34d6511342..8a82e891402814e0fe891ed27184d00d9ff8f50a 100755 (executable)
--- 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 18a32dc591aa8542945a51c310db76994cee987e..ed4d4f5e8bfd44a15dc37597c6aa9ca009c03cc3 100755 (executable)
--- 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 3155397e79171e7eb782b9f7896b57a08fd4c62c..229c63ef4597ec59b2b0e4e47a9abe157faceb91 100755 (executable)
--- 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 32739dd9f64cd0da60dafcfe24487f2ccf64fbf5..8cbf1b96549f7d9ce9bb82a3df0f4a5e3c99a97a 100755 (executable)
--- 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 fe10acda7e374951159ce6a68bd9fbd9c3f81020..8e7bfcd217d854f0a617e51515cb83915907145a 100755 (executable)
--- 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 f1d886ba583ce8745e233e74ded2fc135343bce4..56930fd650e3938b674ef13d4b757ee51d31e4cc 100755 (executable)
--- 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 c167076af7edb729778616fae4d3ac42ea35641a..2d80f599d0882739e3dc674146f96bc688679fc7 100755 (executable)
--- 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 b97b0a0b5eae4962f89e3af895f0cb1af9e30767..8eaf5cd68d53963c6e91274c6307a311d477a006 100755 (executable)
--- 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 3f18045b48f0b0c41f3934fd1a65ffac08691371..41e60fb80360983ffd1e6b914e4673047efb14b8 100755 (executable)
--- 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 01b1697d45cdcd715060373fa71924766e7cb401..d04363021953cab0527449857ace860528bee33f 100755 (executable)
--- 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 fda23ed2d63a1da48335944d8ae097f79fb157ed..944f63136a51bf17920386e160d9531f848d3362 100755 (executable)
--- 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 513c32565197fcabcb649748c8df79f4d5fff6e4..dbb558483ae754db8399aa2039935ff01b2afc38 100755 (executable)
--- 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 5530eee4fbfa06c5ce6465480af28b84a7c704ae..26b7a275a24d78417da42731cda1ae927807fa74 100755 (executable)
--- 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 b0b362c8fd8cc5a4306533468108e03b31c06b3e..b58c90822a9f75ed64cbfc78aed9377b3f2bd521 100755 (executable)
--- 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 d7e934e390a3a6f0b141ba9dd82daf769a82dead..2d2868d0f1f4912a031baf88036c182c448b1998 100755 (executable)
--- 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 a5020e646891b3607d644e7e7fab65ffdf626668..7ed5b086606184ec5e78a0c160db09f8bb425bf8 100755 (executable)
--- 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 cf7c994bdd26ef42cd7f4dc292b27e50455be3e5..b5cfc1d5e1db42a10ada1b2b74f4e14ab633b269 100755 (executable)
--- 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 36dde3dc2e313bd204aa86d04e238a7f72ee4872..0b03595881d0cc3ebb5dec4226e7b17ce43f7d17 100755 (executable)
--- 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 4af7afee39bfe53912f5fc97d16d89b3f9fd018c..709969a2558cc024ccaafe62cd197ec3bbe6adcb 100755 (executable)
--- 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 b082901a62fc441cd546d8706f4de659c1c8484f..13dfea870350fb79e6fbe7ef4b84e7e52d24b9d8 100755 (executable)
--- 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 b21e1e60347923034269e14df956e84a065ae756..8ce291c7727eb4429df703774f799f69186a3110 100755 (executable)
--- 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 c90f6073089fa6aa5ad1d3e08494dcdcf93ddf96..4e1b27b487ba2790b1fa6aadcfd523b00333d1fd 100755 (executable)
--- 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 8dc19d4fa4271df38ded5433893a23ea8c28d947..ae38062bcbf0e3e411aea1049deb4c1b57832ae9 100755 (executable)
--- 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 816b72d184378cbd436d00150818ac4db178b0dc..3ed2d0ab23e2fa8064e27a29ab99dad501d05013 100755 (executable)
--- 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 81d405a72617d3e820eaa700840d80b4ced4f103..910ed507f0a43eb850383f1caa2d95dd1df9796b 100755 (executable)
--- 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 3aef6abaa776fb3cefd30e5d0058409ced459f5b..573fd24feaffac972ea930bf998cf1643a97945f 100755 (executable)
--- 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 155de1828835adb159e4cccad81056c3461de2e6..3fa4e912f5dc48f7b846b9e9855af3a1a4941e2d 100755 (executable)
--- 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 6400d5b844440b5ea150cc4fe8781e44b0d1e844..4511cbea60bf58bc65291e35ad664cc709be63c2 100755 (executable)
--- 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 0085d1f48c4f2cad482e93026c35e76053913bc6..416c97e98ac357ba287039435b6481ed926942cf 100755 (executable)
--- 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 fc20bd69ec9c0cf0758080a772000e1e94dafe96..3010a007bcf46a322ca88cb14c71d8ba94c8b68e 100755 (executable)
--- 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 8a4d66154b215c5a5f2b3e6640af3d7b8938540a..fafafdcfe7ee4a8ea826bd09148766395a2be27c 100755 (executable)
--- 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 20e88e8757d3eeadf75112861666cc8783c75d74..fdcbecbdc8fa3f5228faeacdae1fa2c25a498229 100755 (executable)
--- 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 b00d3ef1bf2d96414f60c0ad914c26464a33f291..1c9fe847057a9df44a059c2de170fe634d40cec3 100755 (executable)
--- 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 3178a9843402c80a2634e84f6f34aefefa66fa82..896949da6b1b31e46102092cc6fc7c7de6025836 100755 (executable)
--- 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 9028de8dc0f171fe75c5f90150ebd4cfeec9f2f2..00fc24f0a876c0d764f8f01bff9fa3230f0cf400 100755 (executable)
--- 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 6e09de67afd170308bfa81f9f654b09669924ea4..bdc1d443f2c4defe56ed676d7079a05afcf5e48d 100755 (executable)
--- 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 9e15e225801a3c93b17dd64e07409c76afa638da..7a12970462484a481cb9ba0e0b00747b96dfd9d5 100755 (executable)
--- 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 48086d704c4fff0f4ab7149c8f184dbc3830e2fb..facef7c79288697b29731c01d9d5685e6d0a1a79 100755 (executable)
--- 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 b48fa948b8f084c991f36032c94998c9dc6845b3..51cacad213e84622ff4c2c646b5633121ee8808f 100755 (executable)
--- 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 1b18654cb11552b03e68664f9be7813ee669780d..a6e53353752000f8c3c6cf5da3106ff22ad9273c 100755 (executable)
--- 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 e85196ce7d171393c6672291a16e74ee5c226bf6..70a9ee3819f252824dca992a91f66f2f209a4462 100755 (executable)
--- 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 371607be67dedcc477cbceb2679c60c33182f6e9..a8cae48ac6840a88f28d0016a31561e1841aa081 100755 (executable)
--- 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 83a9cecee0b76b91a028220c5c6a319c7f9ce0fc..279c3115edd3a635c94ae33dc559cad635796f71 100755 (executable)
--- 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 e07881b0e067ad6c94b9baa59b80aca9475a11d9..fb9eab22101616bf4608a14db1bf57367236b94c 100755 (executable)
--- 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 485620fe409c0a855250142fe0115d0ab9e020ca..91a12096edb2e521689248ad2075e7e83aed5e27 100755 (executable)
--- 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 829685055d1b105fcb0ca3be5d430af32987d677..c00529cf1c486c163cae71abad0476019350b603 100755 (executable)
--- 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 c8d3f9bc7b1033b3f03631d935697ad2e4fc5078..e7bb9a8323964a7241278cd1a59328f1a8d60261 100755 (executable)
--- 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 c54259469eb854aa6dc757baece10334e03896c7..4cbd54860acd00b67e13d4a09b4eb8409da02dde 100755 (executable)
--- 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 be3e546c0ec90bd06f1e142950d8593204a14af3..2c813b9e176baaf2a55f9ad62ee7053576acc290 100755 (executable)
--- 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 46ae7697165163aa3621a98f050d10232aeff2f5..23456d053c2ce037934d63c46e1888843e4e52a4 100755 (executable)
--- 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 11b153feeafb31700db8f80cd82ee41c70021629..32aaf8c30a5f2d030cbd6897ff3b1dcd624ae941 100755 (executable)
--- 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 b62dec60314e3e8093aa9d50a1978162e0054a5d..1c3f2b9b2c93474b12f8136c3373d75e204369f5 100755 (executable)
--- 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 571fdb019420b1602456fcdfba6a25ac4ce0c8ab..f9f4e8fd3dc86ecf622277401e0e820bd00c48bb 100755 (executable)
--- 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 1d27f7cdaae8b66e8ebd3c2a11af5a4781c2ed8d..a6f6fc424ed5240fdb900f6d7eb1e1d4d2f48329 100755 (executable)
--- 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 3057ecbbd8b2b5025960e3efa4ef564719938c1c..846ca20c609fc2169e611482e7b7f6cb05291f42 100755 (executable)
--- 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 69c27474e6a691ad58ac760def8503009ea625ee..a67298362131c14cc4cfa791be1f3b536608ed77 100755 (executable)
--- 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 a2782bbba4abb02065e7c208d2053e1ac05d2e03..a95562d13834d0dc7d004b5cb2d05aefc5ac3a02 100755 (executable)
--- 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 a9ab828bc46a71df975f048e2f6f1e4bd947209f..7734df7b8168cb9bccf747060a736ecabc208c90 100755 (executable)
--- 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 8c37f8d90db1bb3c3c8faaef3123fd74adc14efe..bf1245f70dcd38a199cb16229b219cd9125d6526 100755 (executable)
--- 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 08183607e7699a6a80afaed4d29c0545e93525e8..ffd0090fc07cfdb880d306e7f336105b10a7f21d 100755 (executable)
--- 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 f7d1f0dcebe02557aeea1ce157563c3a4407211c..f83b6283d74dcd6da65cf36f3dac925bc219cd7e 100755 (executable)
--- 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 27dc3b2eaa74f815d658430421deb88542a23ba8..a12fe49b64052374a4bdf47ef1f521542cec2d4b 100644 (file)
--- 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 8c1d01898a2e6240da6b44ef84905a7cf38c74ea..50e8ab4b7da60efc39b3e5f8c287d6119844efd7 100755 (executable)
--- 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 98b36e745685a2678492e9b75d8e56f583c89c03..93971d251170b4d41dcd5e64dfc76c4398b3e2da 100755 (executable)
--- 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 32578fe573ce8470936dae0e6e2a46df8280c28e..e99bff2a248ddcb44097a8f4d3e6731f51620169 100755 (executable)
--- 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 1fdb76a778bed64713dcd1fdf0e8f00abe817370..560f6c7ce093e7181bf48942f90f3e7b9c0a1a68 100755 (executable)
--- 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 fec0525ed8d34fe582b7580eb8adeb1d4667717b..decbaaecb210497efc5d7eeda795c76b48739409 100755 (executable)
--- 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 3496a622fd092def470e908d718e6ed57ab5f5e9..a32eaaa4a81ac615e5bbb7e1a4ac120f4ffd70a7 100755 (executable)
--- 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 df8810dcc07030b596cb571ae47e9aa870e1e4c7..14a4f7bb0295c06e7d9c1ccfea4c3aca63f6451d 100755 (executable)
--- 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 1c50e8b66fd0acde8616571933c459141cf0cd80..0b39bc6961e9e258988d2790c5af8ab36c53826c 100755 (executable)
--- 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 7e98daf6a0e6fc287edfa0808b1a7ef2ffc18a34..38ee6f1f1d7c8103ce06b28a1b4f74b63ebf6472 100755 (executable)
--- 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 d45668a698d6c281afa05c9a28b1cbe40b68b8a0..86454c5fd7993e9b3789972badf6dc9710a6e62f 100755 (executable)
--- 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 f3018a57af4b46ed691797872df8991a265fdd49..abd101cca38644c33ed42f0cabd1ffa003de5ed7 100755 (executable)
--- 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 2deff69ae6e3e4720bde5a6eb79ef6ff1f244871..8ff388b6443696d30115f131668948f282db64cd 100755 (executable)
--- 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 b684a36177e2016734036a7d84e6a0cfec3e7370..a1fa58c4bd4f3be22f724c90609b097c39ad3254 100755 (executable)
--- 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 b6fef16d7cd555fb191248fc0995088c687b4d44..ae68a5f6f83ae5aa68344aa7f02ef5f02f6eedcb 100755 (executable)
--- 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 426f37b50acc5f37a05a81c6da5032f4ff74a689..0b9fd283c99aade8d538213769ff0d4495a21ff5 100755 (executable)
--- 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 3e63bfed8774a9eca5693e7141e08ef8759f23d5..ae0074063cff7417b1b61c0f65745b970679f3f5 100755 (executable)
--- 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 404562d889212f3718e0619b9bbd258f0edafbad..4727371fadc4f8b1543e69c27cae2d051f9e5e62 100755 (executable)
--- 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 d7badd74f263ca30a6154f22ef2a6eba33d5a496..007e5d770d35f72fc0b55fa1c25f5220d5863c1e 100755 (executable)
--- 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 36cfa0e8c381df2f0911f6c4ab1a218a10bbffd2..a1c7fcdf8e6be7c1b56cb443d3c668a07b95b9a4 100755 (executable)
--- 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 e50c25765618f5cedea862a8864ce981bef354de..9e94d4789ea542005a680fcc6c621cbc86a653bd 100755 (executable)
--- 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 55466c4391bcf9f2f56ececb8f72eeefb98fb187..a81b4bcdb6a9cd936b638769a07be03125bb6880 100755 (executable)
--- 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 2d61bb58fe87ae0fdf4f767e32f42975da4c5660..b4c04fe4111a5befedc4b483db7ad01e3c9592e8 100755 (executable)
--- 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 e93bf0ac09dadd715607fec422fceb1cc7fe5a97..e927d4aa967a042c018c76ab212303e3a878ed5e 100755 (executable)
--- 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 a957a8fdbf8b999a01f6b547a696e892c4ee4c04..11f67847f16d21315bfc9a0a25398ee478765433 100755 (executable)
--- 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 e6743d16625cd62a8457a7673af6cbdacc30f096..bf1f0ab5dbe327da8d83d4ce4705b863e19b60c3 100755 (executable)
--- 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 96aa092326213544f414f55f0ac691c8dc9d48cb..a81560fbb8fe679dc138682b87fade9716755976 100755 (executable)
--- 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 95002e567720a757386f059af1bc70136b2252d2..ce6623ec14a90505893023a1574d6fa5d0ecfa0f 100755 (executable)
--- 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 d2032550b2a5262e8c9ea96995590a29d0fecb75..c041edbf328d51b1eb15dd00ea1003af85aea28c 100755 (executable)
--- 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 9645f4dbd6ccd6d705863497c7eeff7ccf5bbf8d..ea4b54c55356d1b09325ba8dc4810645536e8139 100755 (executable)
--- 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 c7215022c358749882e12066c493fe45fb9daf29..c475903a2183191a6c00f4defb4e1f53ba072426 100755 (executable)
--- 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 9821fc1e4742772f4097862fdad12c9d190b1f36..20c398daebac26efffcb12ea1dff6fe7c5b0ba4b 100755 (executable)
--- 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 265f2880b7b6bf92349cf5a2563efe67624b1671..c65055dea11db627f7d9484e831379166d6db6b8 100755 (executable)
--- 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 7e56a305ab935828c64fc1f24d217f94db080cf8..0c5e36782a7d71b805c5aa2b0bf737a1eb164e98 100755 (executable)
--- 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 97b9100182216a4583fd8626196cf567e1551e23..cc5e7c62e3ead81655aa598a7e426bf62d3af023 100755 (executable)
--- 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