diff options
| author | Jim Meyering <meyering@redhat.com> | 2010-11-17 21:35:31 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2010-11-17 21:45:51 +0100 |
| commit | 293c37b9061c1afd0acd143bbded637a8f00b3a0 (patch) | |
| tree | a7257594a4a6d18c2011f9ea87a86b0f07376bb6 /tests | |
| parent | 5c0275e95353742854da6b915fed4fd0434d8159 (diff) | |
| download | coreutils-293c37b9061c1afd0acd143bbded637a8f00b3a0.tar.xz | |
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/'
Diffstat (limited to 'tests')
348 files changed, 348 insertions, 348 deletions
diff --git a/tests/chgrp/basic b/tests/chgrp/basic index 7d6716624..91b111ff9 100755 --- a/tests/chgrp/basic +++ b/tests/chgrp/basic @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chgrp --version +print_ver_ chgrp require_membership_in_two_groups_ diff --git a/tests/chgrp/default-no-deref b/tests/chgrp/default-no-deref index 77d3bcbcb..0b380acd5 100755 --- a/tests/chgrp/default-no-deref +++ b/tests/chgrp/default-no-deref @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chgrp --version +print_ver_ chgrp require_membership_in_two_groups_ set _ $groups; shift diff --git a/tests/chgrp/deref b/tests/chgrp/deref index e3cfed229..d470fe12b 100755 --- a/tests/chgrp/deref +++ b/tests/chgrp/deref @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chgrp --version +print_ver_ chgrp require_membership_in_two_groups_ set _ $groups; shift diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x index e3a4aefd0..d309bd761 100755 --- a/tests/chgrp/no-x +++ b/tests/chgrp/no-x @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chgrp --version +print_ver_ chgrp require_membership_in_two_groups_ skip_if_root_ diff --git a/tests/chgrp/posix-H b/tests/chgrp/posix-H index 6cf101c8f..c5aeb4bfd 100755 --- a/tests/chgrp/posix-H +++ b/tests/chgrp/posix-H @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chgrp --version +print_ver_ chgrp require_membership_in_two_groups_ set _ $groups; shift diff --git a/tests/chgrp/recurse b/tests/chgrp/recurse index 0f7f00f22..9f92fdb35 100755 --- a/tests/chgrp/recurse +++ b/tests/chgrp/recurse @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chgrp --version +print_ver_ chgrp require_membership_in_two_groups_ set _ $groups; shift diff --git a/tests/chmod/c-option b/tests/chmod/c-option index 4db905fc6..440702fd2 100755 --- a/tests/chmod/c-option +++ b/tests/chmod/c-option @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chmod --version +print_ver_ chmod umask 0 file=f diff --git a/tests/chmod/equal-x b/tests/chmod/equal-x index 32226f1ff..bb9e4b2da 100755 --- a/tests/chmod/equal-x +++ b/tests/chmod/equal-x @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chmod --version +print_ver_ chmod file=f touch $file || framework_failure diff --git a/tests/chmod/equals b/tests/chmod/equals index 79e01fb04..8dd9d5246 100755 --- a/tests/chmod/equals +++ b/tests/chmod/equals @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chmod --version +print_ver_ chmod touch f || framework_failure diff --git a/tests/chmod/inaccessible b/tests/chmod/inaccessible index 37dc8ffac..b88fa5536 100755 --- a/tests/chmod/inaccessible +++ b/tests/chmod/inaccessible @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chmod --version +print_ver_ chmod mkdir -p d/e || framework_failure chmod 0 d/e d || framework_failure diff --git a/tests/chmod/no-x b/tests/chmod/no-x index 464a2544a..b6dfea147 100755 --- a/tests/chmod/no-x +++ b/tests/chmod/no-x @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chmod --version +print_ver_ chmod skip_if_root_ mkdir -p d/no-x/y a/b || framework_failure diff --git a/tests/chmod/octal b/tests/chmod/octal index add57775b..6eec93cae 100755 --- a/tests/chmod/octal +++ b/tests/chmod/octal @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chmod --version +print_ver_ chmod # Before coreutils-5.92, this would mistakenly succeed, diff --git a/tests/chmod/setgid b/tests/chmod/setgid index 89e971c5f..7bfe4eda6 100755 --- a/tests/chmod/setgid +++ b/tests/chmod/setgid @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chmod --version +print_ver_ chmod umask 0 mkdir d || framework_failure diff --git a/tests/chmod/thru-dangling b/tests/chmod/thru-dangling index 8421a989c..3fb470287 100755 --- a/tests/chmod/thru-dangling +++ b/tests/chmod/thru-dangling @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chmod --version +print_ver_ chmod ln -s non-existent dangle || framework_failure diff --git a/tests/chmod/umask-x b/tests/chmod/umask-x index e0c5e36a9..f11d53d71 100755 --- a/tests/chmod/umask-x +++ b/tests/chmod/umask-x @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chmod --version +print_ver_ chmod touch file chmod 755 file diff --git a/tests/chmod/usage b/tests/chmod/usage index e2d33fc32..e6f91c708 100755 --- a/tests/chmod/usage +++ b/tests/chmod/usage @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chmod --version +print_ver_ chmod # Each line in this list is a set of arguments, followed by :, diff --git a/tests/chown/basic b/tests/chown/basic index 3ad43b403..59f3cb7b4 100755 --- a/tests/chown/basic +++ b/tests/chown/basic @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chgrp --version +print_ver_ chgrp require_root_ touch f || framework_failure diff --git a/tests/chown/deref b/tests/chown/deref index 85603b429..7ea8a0951 100755 --- a/tests/chown/deref +++ b/tests/chown/deref @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chown --version +print_ver_ chown ln -s no-such dangle || framework_failure diff --git a/tests/chown/preserve-root b/tests/chown/preserve-root index c01149629..f3cd26741 100755 --- a/tests/chown/preserve-root +++ b/tests/chown/preserve-root @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chown --version +print_ver_ chown skip_if_root_ mkdir d && ln -s / d/slink-to-root diff --git a/tests/chown/separator b/tests/chown/separator index 914d9cca4..859ae9ae1 100755 --- a/tests/chown/separator +++ b/tests/chown/separator @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chown --version +print_ver_ chown id_u=`id -u` || framework_failure test -n "$id_u" || framework_failure diff --git a/tests/cp/abuse b/tests/cp/abuse index fb5e4358c..712737b1d 100755 --- a/tests/cp/abuse +++ b/tests/cp/abuse @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir a b c || framework_failure ln -s ../t a/1 || framework_failure diff --git a/tests/cp/backup-1 b/tests/cp/backup-1 index 690846214..94c1f2a67 100755 --- a/tests/cp/backup-1 +++ b/tests/cp/backup-1 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp suffix=.b file=b1.$$ diff --git a/tests/cp/backup-dir b/tests/cp/backup-dir index c1718dedc..33298e699 100755 --- a/tests/cp/backup-dir +++ b/tests/cp/backup-dir @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir x y || framework_failure diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src index 8a8b48069..301088c0b 100755 --- a/tests/cp/backup-is-src +++ b/tests/cp/backup-is-src @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp echo a > a || framework_failure echo a-tilde > a~ || framework_failure diff --git a/tests/cp/capability b/tests/cp/capability index 3a241d058..c188284a5 100755 --- a/tests/cp/capability +++ b/tests/cp/capability @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls require_root_ working_umask_or_skip_ diff --git a/tests/cp/cp-HL b/tests/cp/cp-HL index f2a2dc438..cca2350c4 100755 --- a/tests/cp/cp-HL +++ b/tests/cp/cp-HL @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir src-dir dest-dir || framework_failure echo f > f || framework_failure diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux index bfc79562d..d5e744bba 100755 --- a/tests/cp/cp-a-selinux +++ b/tests/cp/cp-a-selinux @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp require_root_ require_selinux_ diff --git a/tests/cp/cp-deref b/tests/cp/cp-deref index 8315a6254..36f9d094f 100755 --- a/tests/cp/cp-deref +++ b/tests/cp/cp-deref @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir a b c d || framework_failure ln -s ../c a || framework_failure diff --git a/tests/cp/cp-i b/tests/cp/cp-i index 8e86267fa..5902fc605 100755 --- a/tests/cp/cp-i +++ b/tests/cp/cp-i @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir -p a b/a/c || framework_failure touch a/c || framework_failure diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup index ad7bfa511..d77568575 100755 --- a/tests/cp/cp-mv-backup +++ b/tests/cp/cp-mv-backup @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp umask 022 diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents index 22100b502..5e8f2c92c 100755 --- a/tests/cp/cp-parents +++ b/tests/cp/cp-parents @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv working_umask_or_skip_ diff --git a/tests/cp/deref-slink b/tests/cp/deref-slink index a11bd0dc9..bf08321f0 100755 --- a/tests/cp/deref-slink +++ b/tests/cp/deref-slink @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp touch f slink-target || framework_failure ln -s slink-target slink || framework_failure diff --git a/tests/cp/dir-rm-dest b/tests/cp/dir-rm-dest index 2923a474e..abddfe22c 100755 --- a/tests/cp/dir-rm-dest +++ b/tests/cp/dir-rm-dest @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir d e || framework_failure diff --git a/tests/cp/dir-slash b/tests/cp/dir-slash index 18050a3af..156987f90 100755 --- a/tests/cp/dir-slash +++ b/tests/cp/dir-slash @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir dir1 dir2 || framework_failure touch dir1/file || framework_failure diff --git a/tests/cp/dir-vs-file b/tests/cp/dir-vs-file index 499014184..ca8db2e86 100755 --- a/tests/cp/dir-vs-file +++ b/tests/cp/dir-vs-file @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir dir || framework_failure touch file || framework_failure diff --git a/tests/cp/existing-perm-race b/tests/cp/existing-perm-race index f1c7bc1ad..f048eb160 100755 --- a/tests/cp/existing-perm-race +++ b/tests/cp/existing-perm-race @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp require_membership_in_two_groups_ diff --git a/tests/cp/fail-perm b/tests/cp/fail-perm index cd763f7da..f6a77a136 100755 --- a/tests/cp/fail-perm +++ b/tests/cp/fail-perm @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp skip_if_root_ chmod g-s . || framework_failure diff --git a/tests/cp/file-perm-race b/tests/cp/file-perm-race index 6b3b60450..140c7ee1f 100755 --- a/tests/cp/file-perm-race +++ b/tests/cp/file-perm-race @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least require_local_dir_ diff --git a/tests/cp/into-self b/tests/cp/into-self index 3341d1a8b..5244a852a 100755 --- a/tests/cp/into-self +++ b/tests/cp/into-self @@ -22,7 +22,7 @@ # cp: can't copy a directory `dir' into itself `dir/dir' . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir a dir || framework_failure diff --git a/tests/cp/link b/tests/cp/link index f0bd241f9..89d060289 100755 --- a/tests/cp/link +++ b/tests/cp/link @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp touch src || framework_failure touch dest || framework_failure diff --git a/tests/cp/link-heap b/tests/cp/link-heap index f5ed6e60e..2a0c04876 100755 --- a/tests/cp/link-heap +++ b/tests/cp/link-heap @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp expensive_ require_ulimit_ diff --git a/tests/cp/link-no-deref b/tests/cp/link-no-deref index d575ec851..794d3df04 100755 --- a/tests/cp/link-no-deref +++ b/tests/cp/link-no-deref @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp ln -s no-such-file dangling-slink || framework_failure diff --git a/tests/cp/link-preserve b/tests/cp/link-preserve index fe5ad42c9..c4f9774f5 100755 --- a/tests/cp/link-preserve +++ b/tests/cp/link-preserve @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp touch a || framework_failure ln a b || framework_failure diff --git a/tests/cp/no-deref-link1 b/tests/cp/no-deref-link1 index f0d1a9e9b..6be72cff0 100755 --- a/tests/cp/no-deref-link1 +++ b/tests/cp/no-deref-link1 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir a b msg=bar diff --git a/tests/cp/no-deref-link2 b/tests/cp/no-deref-link2 index 2351589a7..0ccb911c3 100755 --- a/tests/cp/no-deref-link2 +++ b/tests/cp/no-deref-link2 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir b msg=bar diff --git a/tests/cp/no-deref-link3 b/tests/cp/no-deref-link3 index 1053b3ef7..d648f3470 100755 --- a/tests/cp/no-deref-link3 +++ b/tests/cp/no-deref-link3 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp msg=bar echo $msg > a diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm index 82dd913ac..62aa80bfb 100755 --- a/tests/cp/parent-perm +++ b/tests/cp/parent-perm @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp working_umask_or_skip_ # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least diff --git a/tests/cp/parent-perm-race b/tests/cp/parent-perm-race index b6374aecd..fd39340bd 100755 --- a/tests/cp/parent-perm-race +++ b/tests/cp/parent-perm-race @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least require_local_dir_ diff --git a/tests/cp/preserve-2 b/tests/cp/preserve-2 index d7565df3b..5f3e0da1a 100755 --- a/tests/cp/preserve-2 +++ b/tests/cp/preserve-2 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp # cp -p gives ENOTSUP on NFS on Linux 2.6.9 at least require_local_dir_ diff --git a/tests/cp/preserve-gid b/tests/cp/preserve-gid index 6fa5293c7..a25cbb478 100755 --- a/tests/cp/preserve-gid +++ b/tests/cp/preserve-gid @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp require_root_ diff --git a/tests/cp/preserve-slink-time b/tests/cp/preserve-slink-time index 5a61b7e8c..a2245f29f 100755 --- a/tests/cp/preserve-slink-time +++ b/tests/cp/preserve-slink-time @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp grep '^#define HAVE_UTIMENSAT 1' "$CONFIG_HEADER" > /dev/null || grep '^#define HAVE_LUTIMES 1' "$CONFIG_HEADER" > /dev/null || diff --git a/tests/cp/proc-short-read b/tests/cp/proc-short-read index 2bc2a6195..3525d00ca 100755 --- a/tests/cp/proc-short-read +++ b/tests/cp/proc-short-read @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp kall=/proc/kallsyms diff --git a/tests/cp/proc-zero-len b/tests/cp/proc-zero-len index ca28fa428..397b91e49 100755 --- a/tests/cp/proc-zero-len +++ b/tests/cp/proc-zero-len @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp touch empty || framework_failure diff --git a/tests/cp/r-vs-symlink b/tests/cp/r-vs-symlink index 7d9dfd8e4..34d6a4e1b 100755 --- a/tests/cp/r-vs-symlink +++ b/tests/cp/r-vs-symlink @@ -21,7 +21,7 @@ # cp: `slink': WARNING: using -r to copy symbolic links is not portable . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp echo abc > foo || framework_failure ln -s foo slink || framework_failure diff --git a/tests/cp/reflink-auto b/tests/cp/reflink-auto index 7d61ed25b..de24df956 100755 --- a/tests/cp/reflink-auto +++ b/tests/cp/reflink-auto @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/cp/reflink-perm b/tests/cp/reflink-perm index a330584c1..6ae8ce43a 100755 --- a/tests/cp/reflink-perm +++ b/tests/cp/reflink-perm @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp : > time_check diff --git a/tests/cp/same-file b/tests/cp/same-file index 97b5b2909..873ac2d40 100755 --- a/tests/cp/same-file +++ b/tests/cp/same-file @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp # Unset CDPATH. Otherwise, output from the `cd dir' command # can make this test fail. diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink index 69e0c9511..4918a3597 100755 --- a/tests/cp/slink-2-slink +++ b/tests/cp/slink-2-slink @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp touch file || framework_failure ln -s file a || framework_failure diff --git a/tests/cp/sparse b/tests/cp/sparse index 60e226b27..9391a9a4d 100755 --- a/tests/cp/sparse +++ b/tests/cp/sparse @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp require_sparse_support_ # Create a sparse file. diff --git a/tests/cp/special-bits b/tests/cp/special-bits index f09e499fc..d468fe376 100755 --- a/tests/cp/special-bits +++ b/tests/cp/special-bits @@ -21,7 +21,7 @@ # The bug was fixed in 4.0z. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp require_root_ touch a b c || framework_failure diff --git a/tests/cp/special-f b/tests/cp/special-f index 6c0b13734..79875b205 100755 --- a/tests/cp/special-f +++ b/tests/cp/special-f @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkfifo fifo || skip_test_ "fifos not supported" diff --git a/tests/cp/src-base-dot b/tests/cp/src-base-dot index 73e4f6ff7..ff07bb9f5 100755 --- a/tests/cp/src-base-dot +++ b/tests/cp/src-base-dot @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir x y || framework_failure diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash index dfc9b2bf0..a104dd66a 100755 --- a/tests/cp/symlink-slash +++ b/tests/cp/symlink-slash @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp mkdir dir || framework_failure ln -s dir symlink || framework_failure diff --git a/tests/cp/thru-dangling b/tests/cp/thru-dangling index 592dda2a5..4d87d35b4 100755 --- a/tests/cp/thru-dangling +++ b/tests/cp/thru-dangling @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp ln -s no-such dangle || framework_failure echo hi > f || framework_failure diff --git a/tests/dd/direct b/tests/dd/direct index 1381ce68c..8954dd849 100755 --- a/tests/dd/direct +++ b/tests/dd/direct @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && dd --version +print_ver_ dd truncate -s 8192 in || framework_failure dd if=in oflag=direct of=out 2> /dev/null \ diff --git a/tests/dd/misc b/tests/dd/misc index 92be45046..54727a1c7 100755 --- a/tests/dd/misc +++ b/tests/dd/misc @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && dd --version +print_ver_ dd tmp_in=dd-in.$$ tmp_in2=dd-in2.$$ diff --git a/tests/dd/not-rewound b/tests/dd/not-rewound index 75c08c952..deea889bd 100755 --- a/tests/dd/not-rewound +++ b/tests/dd/not-rewound @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && dd --version +print_ver_ dd echo abcde > in diff --git a/tests/dd/reblock b/tests/dd/reblock index c5d667c8c..f70ffed58 100755 --- a/tests/dd/reblock +++ b/tests/dd/reblock @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && dd --version +print_ver_ dd # 2 short reads -> 1 full write + 1 partial write cat <<\EOF > exp-reblock || framework_failure diff --git a/tests/dd/skip-seek-past-dev b/tests/dd/skip-seek-past-dev index 762671c27..a49f1b31b 100755 --- a/tests/dd/skip-seek-past-dev +++ b/tests/dd/skip-seek-past-dev @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && dd --version +print_ver_ dd # need write access to local device # (even though we don't actually write anything) diff --git a/tests/dd/skip-seek-past-file b/tests/dd/skip-seek-past-file index 605e964f7..d8cd27ae7 100755 --- a/tests/dd/skip-seek-past-file +++ b/tests/dd/skip-seek-past-file @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && dd --version +print_ver_ dd require_sparse_support_ # for `truncate --size=$OFF_T_MAX` eval $(getlimits) # for OFF_T limits diff --git a/tests/dd/skip-seek2 b/tests/dd/skip-seek2 index 4897e10e1..a915f4239 100755 --- a/tests/dd/skip-seek2 +++ b/tests/dd/skip-seek2 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && dd --version +print_ver_ dd echo LA:3456789abcdef > in || fail=1 diff --git a/tests/dd/stderr b/tests/dd/stderr index fd7b7470d..2b9e94156 100755 --- a/tests/dd/stderr +++ b/tests/dd/stderr @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && dd --version +print_ver_ dd p=$abs_top_builddir diff --git a/tests/dd/unblock-sync b/tests/dd/unblock-sync index 2d8dc328e..29a203275 100755 --- a/tests/dd/unblock-sync +++ b/tests/dd/unblock-sync @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && dd --version +print_ver_ dd printf 000100020003xx > in || framework_failure diff --git a/tests/df/total-verify b/tests/df/total-verify index abe85bcbf..fe17c0503 100755 --- a/tests/df/total-verify +++ b/tests/df/total-verify @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && df --version +print_ver_ df df || skip_test_ "df fails" diff --git a/tests/df/unreadable b/tests/df/unreadable index 5c9876002..a54afe493 100755 --- a/tests/df/unreadable +++ b/tests/df/unreadable @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && df --version +print_ver_ df skip_if_root_ touch unreadable || fail=1 diff --git a/tests/du/2g b/tests/du/2g index 0021fdadc..da3cc6a48 100755 --- a/tests/du/2g +++ b/tests/du/2g @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du # Creating a 2GB file counts as `very expensive'. very_expensive_ diff --git a/tests/du/8gb b/tests/du/8gb index f416111ed..ccfa67475 100755 --- a/tests/du/8gb +++ b/tests/du/8gb @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du require_sparse_support_ dd bs=1 seek=8G of=big < /dev/null 2> /dev/null diff --git a/tests/du/basic b/tests/du/basic index b96d861c8..3d0f73e9c 100755 --- a/tests/du/basic +++ b/tests/du/basic @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du mkdir -p a/b d d/sub || framework_failure diff --git a/tests/du/deref b/tests/du/deref index 0dbf4854e..17f506219 100755 --- a/tests/du/deref +++ b/tests/du/deref @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du mkdir -p a/sub || framework_failure ln -s a/sub slink || framework_failure diff --git a/tests/du/deref-args b/tests/du/deref-args index 1743b0448..49bfc47c4 100755 --- a/tests/du/deref-args +++ b/tests/du/deref-args @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du mkdir -p dir/a || framework_failure ln -s dir slink || framework_failure diff --git a/tests/du/exclude b/tests/du/exclude index d3295cf68..06a489fdc 100755 --- a/tests/du/exclude +++ b/tests/du/exclude @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du mkdir -p a/b/c a/x/y a/u/v || framework_failure diff --git a/tests/du/fd-leak b/tests/du/fd-leak index 728ce0533..a9f00863f 100755 --- a/tests/du/fd-leak +++ b/tests/du/fd-leak @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du # Call this an expensive test. It's not that expensive, but command line # limitations might induce failure on some losing systems. diff --git a/tests/du/hard-link b/tests/du/hard-link index 68a7e2245..576342f3f 100755 --- a/tests/du/hard-link +++ b/tests/du/hard-link @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du mkdir -p dir/sub ( cd dir && diff --git a/tests/du/inacc-dest b/tests/du/inacc-dest index 24242815d..482cb308e 100755 --- a/tests/du/inacc-dest +++ b/tests/du/inacc-dest @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du skip_if_root_ mkdir f && cd f && mkdir a b c d e && touch c/j && chmod a-x c \ diff --git a/tests/du/inacc-dir b/tests/du/inacc-dir index 0be254c78..78bdaf327 100755 --- a/tests/du/inacc-dir +++ b/tests/du/inacc-dir @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du skip_if_root_ mkdir -p a/sub || framework_failure diff --git a/tests/du/inaccessible-cwd b/tests/du/inaccessible-cwd index a1656b217..264a3816e 100755 --- a/tests/du/inaccessible-cwd +++ b/tests/du/inaccessible-cwd @@ -21,7 +21,7 @@ # this test would fail. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du skip_if_root_ cwd=`pwd` diff --git a/tests/du/long-from-unreadable b/tests/du/long-from-unreadable index 2b38e69e7..1da08bfaa 100755 --- a/tests/du/long-from-unreadable +++ b/tests/du/long-from-unreadable @@ -29,7 +29,7 @@ # unnecessarily to using FTS_NOCHDIR mode in this corner case. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du proc_file=/proc/self/fd if test ! -d $proc_file; then diff --git a/tests/du/long-sloop b/tests/du/long-sloop index 391174a3d..b3abd4802 100755 --- a/tests/du/long-sloop +++ b/tests/du/long-sloop @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du # Create lots of directories, each containing a single symlink # pointing at the next directory in the list. diff --git a/tests/du/no-deref b/tests/du/no-deref index d56bc753e..c3e8840cf 100755 --- a/tests/du/no-deref +++ b/tests/du/no-deref @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du mkdir -p dir/a/b || framework_failure ln -s dir slink || framework_failure diff --git a/tests/du/no-x b/tests/du/no-x index 580b527a4..0cee47d94 100755 --- a/tests/du/no-x +++ b/tests/du/no-x @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du skip_if_root_ mkdir -p d/no-x/y || framework_failure diff --git a/tests/du/one-file-system b/tests/du/one-file-system index bb4d7cba1..7c02b41a5 100755 --- a/tests/du/one-file-system +++ b/tests/du/one-file-system @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du mkdir -p b/c y/z || framework_failure diff --git a/tests/du/restore-wd b/tests/du/restore-wd index bb2b165c5..a50a4518d 100755 --- a/tests/du/restore-wd +++ b/tests/du/restore-wd @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du mkdir a b || framework_failure diff --git a/tests/du/slash b/tests/du/slash index 3434e3ef3..daf5d6687 100755 --- a/tests/du/slash +++ b/tests/du/slash @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du require_readable_root_ diff --git a/tests/du/slink b/tests/du/slink index 092ea1292..1340c7641 100755 --- a/tests/du/slink +++ b/tests/du/slink @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du # Determine if `.' is on a local (would non-NFS be sufficient?) file system. # At least on OSF/1 4.0d, when using an nfsv3 file system, diff --git a/tests/du/trailing-slash b/tests/du/trailing-slash index 70549a80d..a054a61bd 100755 --- a/tests/du/trailing-slash +++ b/tests/du/trailing-slash @@ -20,7 +20,7 @@ # Before coreutils-4.5.3, it would remove a single trailing slash. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du mkdir -p dir/1/2 || framework_failure ln -s dir slink || framework_failure diff --git a/tests/du/two-args b/tests/du/two-args index ed544b091..4c71f2849 100755 --- a/tests/du/two-args +++ b/tests/du/two-args @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && du --version +print_ver_ du # Run this test from a sub-directory one level deeper than normal, # so that the "du .." below doesn't traverse sibling directories diff --git a/tests/id/no-context b/tests/id/no-context index 90ff71ee0..8ae9aaf11 100755 --- a/tests/id/no-context +++ b/tests/id/no-context @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && id --version +print_ver_ id # We don't need selinux *FS* support to test id, # but this is as good a witness as any, in general. diff --git a/tests/install/basic-1 b/tests/install/basic-1 index 6470f5dd3..5e07bab00 100755 --- a/tests/install/basic-1 +++ b/tests/install/basic-1 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ginstall --version +print_ver_ ginstall skip_if_root_ dir=dir diff --git a/tests/install/create-leading b/tests/install/create-leading index acb92a9a6..3801030bc 100755 --- a/tests/install/create-leading +++ b/tests/install/create-leading @@ -20,7 +20,7 @@ # that's the name of the binary in ../../src. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ginstall --version +print_ver_ ginstall file=file diff --git a/tests/install/d-slashdot b/tests/install/d-slashdot index b7cd17a22..7c43703c7 100755 --- a/tests/install/d-slashdot +++ b/tests/install/d-slashdot @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && install --version +print_ver_ install ginstall -d d1/. || fail=1 diff --git a/tests/install/install-C b/tests/install/install-C index ea6292c79..d9204e82d 100755 --- a/tests/install/install-C +++ b/tests/install/install-C @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ginstall --version +print_ver_ ginstall skip_if_setgid_ mode1=0644 diff --git a/tests/install/install-C-root b/tests/install/install-C-root index a36aa1efe..744c4c18c 100755 --- a/tests/install/install-C-root +++ b/tests/install/install-C-root @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ginstall --version +print_ver_ ginstall require_root_ skip_if_setgid_ diff --git a/tests/install/install-C-selinux b/tests/install/install-C-selinux index 8818c7359..d203a0b90 100755 --- a/tests/install/install-C-selinux +++ b/tests/install/install-C-selinux @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ginstall --version +print_ver_ ginstall require_selinux_ diff --git a/tests/install/strip-program b/tests/install/strip-program index 71001d9d9..e54c2e114 100755 --- a/tests/install/strip-program +++ b/tests/install/strip-program @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ginstall --version +print_ver_ ginstall working_umask_or_skip_ diff --git a/tests/install/trap b/tests/install/trap index 3092e9249..58bd5bcaa 100755 --- a/tests/install/trap +++ b/tests/install/trap @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ginstall --version +print_ver_ ginstall # Use a subshell and an exec to work around a bug in FreeBSD 5.0 /bin/sh. diff --git a/tests/ln/backup-1 b/tests/ln/backup-1 index f07ba9493..17e9428f0 100755 --- a/tests/ln/backup-1 +++ b/tests/ln/backup-1 @@ -20,7 +20,7 @@ # Based on a problem report from Jamie Lokier. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ln --version +print_ver_ ln touch a b || framework_failure diff --git a/tests/ln/hard-backup b/tests/ln/hard-backup index 3b3f6ec71..41af2d907 100755 --- a/tests/ln/hard-backup +++ b/tests/ln/hard-backup @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ln --version +print_ver_ ln touch f || framework_failure diff --git a/tests/ln/hard-to-sym b/tests/ln/hard-to-sym index a78b738ad..13d22fbed 100755 --- a/tests/ln/hard-to-sym +++ b/tests/ln/hard-to-sym @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ln --version +print_ver_ ln # =================================================== diff --git a/tests/ln/misc b/tests/ln/misc index de03890f4..994f42ea3 100755 --- a/tests/ln/misc +++ b/tests/ln/misc @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ln --version +print_ver_ ln t=tln-symlink d=tln-subdir diff --git a/tests/ln/sf-1 b/tests/ln/sf-1 index 189abe5b8..4ba8f3d18 100755 --- a/tests/ln/sf-1 +++ b/tests/ln/sf-1 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ln --version +print_ver_ ln echo foo > a || framework_failure ln -s . b || framework_failure diff --git a/tests/ln/slash-decorated-nonexistent-dest b/tests/ln/slash-decorated-nonexistent-dest index 1020da270..e07bb3d74 100755 --- a/tests/ln/slash-decorated-nonexistent-dest +++ b/tests/ln/slash-decorated-nonexistent-dest @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ln --version +print_ver_ ln touch f || framework_failure diff --git a/tests/ln/target-1 b/tests/ln/target-1 index 1f1ebc2d5..e5e86c007 100755 --- a/tests/ln/target-1 +++ b/tests/ln/target-1 @@ -22,7 +22,7 @@ # Based on a test case from Dmitry V. Levin. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ln --version +print_ver_ ln mkdir d || framework_failure ln -s --target-dir=d ../f || fail=1 diff --git a/tests/ls/abmon-align b/tests/ls/abmon-align index 21c22f480..8d27bdc57 100755 --- a/tests/ls/abmon-align +++ b/tests/ls/abmon-align @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls for mon in $(seq -w 12); do touch -d"+$mon month" $mon.ts || framework_failure diff --git a/tests/ls/capability b/tests/ls/capability index 200060ae8..588ec6d07 100755 --- a/tests/ls/capability +++ b/tests/ls/capability @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls require_root_ grep '^#define HAVE_CAP 1' $CONFIG_HEADER > /dev/null \ diff --git a/tests/ls/color-clear-to-eol b/tests/ls/color-clear-to-eol index 683ee4e9f..383c164a1 100755 --- a/tests/ls/color-clear-to-eol +++ b/tests/ls/color-clear-to-eol @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls long_name=zzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzzz.foo touch $long_name || framework_failure diff --git a/tests/ls/color-dtype-dir b/tests/ls/color-dtype-dir index b691ae75c..9521f0ddf 100755 --- a/tests/ls/color-dtype-dir +++ b/tests/ls/color-dtype-dir @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls # Don't let a different umask perturb the results. umask 22 diff --git a/tests/ls/color-norm b/tests/ls/color-norm index 9d946a09b..113bf6ec3 100755 --- a/tests/ls/color-norm +++ b/tests/ls/color-norm @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls # Don't let a different umask perturb the results. umask 22 diff --git a/tests/ls/dangle b/tests/ls/dangle index f544df266..d34b8f390 100755 --- a/tests/ls/dangle +++ b/tests/ls/dangle @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls ln -s no-such-file dangle || framework_failure mkdir -p dir/sub || framework_failure diff --git a/tests/ls/dired b/tests/ls/dired index b59426d83..c961cc941 100755 --- a/tests/ls/dired +++ b/tests/ls/dired @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls mkdir dir || framework_failure diff --git a/tests/ls/file-type b/tests/ls/file-type index 07a8cd433..1dc68d776 100755 --- a/tests/ls/file-type +++ b/tests/ls/file-type @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls mkdir sub cd sub diff --git a/tests/ls/follow-slink b/tests/ls/follow-slink index 00e49bac9..0c06ded1d 100755 --- a/tests/ls/follow-slink +++ b/tests/ls/follow-slink @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls # Isolate output files from directory being listed mkdir dir dir/sub dir1 || framework_failure diff --git a/tests/ls/infloop b/tests/ls/infloop index be89efcab..2491dede5 100755 --- a/tests/ls/infloop +++ b/tests/ls/infloop @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls mkdir loop || framework_failure ln -s ../loop loop/sub || framework_failure diff --git a/tests/ls/inode b/tests/ls/inode index 08ae0f8b9..7072d4661 100755 --- a/tests/ls/inode +++ b/tests/ls/inode @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls touch f || framework_failure ln -s f slink || framework_failure diff --git a/tests/ls/m-option b/tests/ls/m-option index b35e527d4..f40d3b048 100755 --- a/tests/ls/m-option +++ b/tests/ls/m-option @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls seq 2000 > b || framework_failure touch a || framework_failure diff --git a/tests/ls/multihardlink b/tests/ls/multihardlink index 46850e883..78f30a005 100755 --- a/tests/ls/multihardlink +++ b/tests/ls/multihardlink @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls working_umask_or_skip_ touch file file1 || framework_failure diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid index 6b4f368d2..e54c7ae55 100755 --- a/tests/ls/nameless-uid +++ b/tests/ls/nameless-uid @@ -20,7 +20,7 @@ . $srcdir/require-perl . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls require_root_ diff --git a/tests/ls/no-arg b/tests/ls/no-arg index 288688b35..c86ac6a28 100755 --- a/tests/ls/no-arg +++ b/tests/ls/no-arg @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls mkdir -p dir/subdir || framework_failure touch dir/subdir/file2 || framework_failure diff --git a/tests/ls/no-cap b/tests/ls/no-cap index c82620269..47e7471ce 100755 --- a/tests/ls/no-cap +++ b/tests/ls/no-cap @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls require_strace_ capget strace -e capget ls --color=always > /dev/null 2> out || fail=1 diff --git a/tests/ls/proc-selinux-segfault b/tests/ls/proc-selinux-segfault index f0dbb96ad..f7b9d9665 100755 --- a/tests/ls/proc-selinux-segfault +++ b/tests/ls/proc-selinux-segfault @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls f=/proc/sys test -r $f || f=. diff --git a/tests/ls/readdir-mountpoint-inode b/tests/ls/readdir-mountpoint-inode index 9a38627c9..8c17eb455 100755 --- a/tests/ls/readdir-mountpoint-inode +++ b/tests/ls/readdir-mountpoint-inode @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls # We use --local here so as to not activate # potentially very many remote mounts. diff --git a/tests/ls/recursive b/tests/ls/recursive index a216249d1..06cfcbbdf 100755 --- a/tests/ls/recursive +++ b/tests/ls/recursive @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls mkdir x y a b c a/1 a/2 a/3 || framework_failure touch f a/1/I a/1/II || framework_failure diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype index bfc51aad3..ad30920eb 100755 --- a/tests/ls/stat-dtype +++ b/tests/ls/stat-dtype @@ -22,7 +22,7 @@ # can report its type nonetheless, using dirent.d_type. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls # Skip this test unless "." is on a file system with useful d_type info. # FIXME: This uses "ls -p" to decide whether to test "ls" with other options, diff --git a/tests/ls/stat-failed b/tests/ls/stat-failed index e7feba552..8f65bbcaf 100755 --- a/tests/ls/stat-failed +++ b/tests/ls/stat-failed @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls skip_if_root_ mkdir d || framework_failure diff --git a/tests/ls/stat-free-symlinks b/tests/ls/stat-free-symlinks index f9b6bb59f..5aa5f1e71 100755 --- a/tests/ls/stat-free-symlinks +++ b/tests/ls/stat-free-symlinks @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls require_strace_ stat touch x || framework_failure diff --git a/tests/ls/stat-vs-dirent b/tests/ls/stat-vs-dirent index 00a08140d..bfa1aba6e 100755 --- a/tests/ls/stat-vs-dirent +++ b/tests/ls/stat-vs-dirent @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls root_dev_ino=`stat --format=%d-%i /` diff --git a/tests/ls/symlink-slash b/tests/ls/symlink-slash index 9db9ba61d..578cd44be 100755 --- a/tests/ls/symlink-slash +++ b/tests/ls/symlink-slash @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls mkdir dir || framework_failure ln -s dir symlink || framework_failure diff --git a/tests/ls/x-option b/tests/ls/x-option index ed6ef625f..e4859f706 100755 --- a/tests/ls/x-option +++ b/tests/ls/x-option @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls mkdir subdir || framework_failure touch subdir/b || framework_failure diff --git a/tests/misc/arch b/tests/misc/arch index 462919f57..a6a209f4f 100755 --- a/tests/misc/arch +++ b/tests/misc/arch @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && arch --version +print_ver_ arch require_built_ arch diff --git a/tests/misc/cat-buf b/tests/misc/cat-buf index 303c4e268..0d9fe349c 100755 --- a/tests/misc/cat-buf +++ b/tests/misc/cat-buf @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cat --version +print_ver_ cat # Use a fifo rather than a pipe in the tests below # so that the producer (cat) will wait until the diff --git a/tests/misc/cat-proc b/tests/misc/cat-proc index 7214c25c8..e29dbcbf9 100755 --- a/tests/misc/cat-proc +++ b/tests/misc/cat-proc @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cat --version +print_ver_ cat f=/proc/cpuinfo diff --git a/tests/misc/chcon b/tests/misc/chcon index 3aefab51b..cea296bdd 100755 --- a/tests/misc/chcon +++ b/tests/misc/chcon @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chcon --version +print_ver_ chcon require_root_ require_selinux_ skip_if_mcstransd_is_running_ diff --git a/tests/misc/chcon-fail b/tests/misc/chcon-fail index 4daa848cf..056525257 100755 --- a/tests/misc/chcon-fail +++ b/tests/misc/chcon-fail @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chcon --version +print_ver_ chcon # neither context nor file diff --git a/tests/misc/chroot-credentials b/tests/misc/chroot-credentials index e671f7fc8..cfa903dd5 100755 --- a/tests/misc/chroot-credentials +++ b/tests/misc/chroot-credentials @@ -18,7 +18,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chroot --version +print_ver_ chroot require_root_ diff --git a/tests/misc/chroot-fail b/tests/misc/chroot-fail index a3044f70b..b7316684b 100755 --- a/tests/misc/chroot-fail +++ b/tests/misc/chroot-fail @@ -18,7 +18,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && chroot --version +print_ver_ chroot # These tests verify exact status of internal failure; since none of diff --git a/tests/misc/close-stdout b/tests/misc/close-stdout index e236558db..b4b4023ce 100755 --- a/tests/misc/close-stdout +++ b/tests/misc/close-stdout @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm p=$abs_top_builddir diff --git a/tests/misc/csplit b/tests/misc/csplit index 98c704c14..a71d87326 100755 --- a/tests/misc/csplit +++ b/tests/misc/csplit @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && csplit --version +print_ver_ csplit # csplit could get a failed assertion to 2.0.17 diff --git a/tests/misc/csplit-1000 b/tests/misc/csplit-1000 index 259d514ca..4612d1513 100755 --- a/tests/misc/csplit-1000 +++ b/tests/misc/csplit-1000 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && csplit --version +print_ver_ csplit # Before coreutils-8.7, this would overrun the 6-byte filename_space buffer. # It's hard to detect that without using valgrind, so here, we simply diff --git a/tests/misc/csplit-heap b/tests/misc/csplit-heap index 0e7f8b2ef..5e754f437 100755 --- a/tests/misc/csplit-heap +++ b/tests/misc/csplit-heap @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && csplit --version +print_ver_ csplit require_ulimit_ diff --git a/tests/misc/date-sec b/tests/misc/date-sec index a9f19a55b..e650b3e94 100755 --- a/tests/misc/date-sec +++ b/tests/misc/date-sec @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && date --version +print_ver_ date diff --git a/tests/misc/df b/tests/misc/df index 22451c53a..d30b7b2bd 100755 --- a/tests/misc/df +++ b/tests/misc/df @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && df --version +print_ver_ df case `df .` in *' diff --git a/tests/misc/df-P b/tests/misc/df-P index bd4e0bc7c..c7be27208 100755 --- a/tests/misc/df-P +++ b/tests/misc/df-P @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && df --version +print_ver_ df df -P . > t1 || fail=1 diff --git a/tests/misc/env b/tests/misc/env index 11343a1ff..1a20ffe1a 100755 --- a/tests/misc/env +++ b/tests/misc/env @@ -18,7 +18,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && env --version +print_ver_ env # Verify clearing the environment diff --git a/tests/misc/false-status b/tests/misc/false-status index a8e1fa624..a802dfb77 100755 --- a/tests/misc/false-status +++ b/tests/misc/false-status @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && false --version +print_ver_ false false --version > /dev/null && fail=1 false --help > /dev/null && fail=1 diff --git a/tests/misc/fmt-long-line b/tests/misc/fmt-long-line index 3fb98e572..89a5ea78f 100755 --- a/tests/misc/fmt-long-line +++ b/tests/misc/fmt-long-line @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && fmt --version +print_ver_ fmt printf '%2030s\n' ' '|sed 's/../ y/g' > in || framework_failure diff --git a/tests/misc/groups-dash b/tests/misc/groups-dash index ea4b94ac7..0fe371691 100755 --- a/tests/misc/groups-dash +++ b/tests/misc/groups-dash @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && groups --version +print_ver_ groups require_built_ groups # Coreutils 6.9 and earlier failed to display information on first argument diff --git a/tests/misc/groups-version b/tests/misc/groups-version index ec157a26c..3a131bf81 100755 --- a/tests/misc/groups-version +++ b/tests/misc/groups-version @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && groups --version +print_ver_ groups require_built_ groups groups --version | sed 's/^groups/id/; /^$/q' > out || fail=1 diff --git a/tests/misc/head-c b/tests/misc/head-c index 70a0b45e8..7c46d0c94 100755 --- a/tests/misc/head-c +++ b/tests/misc/head-c @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && head --version +print_ver_ head echo abc > in || framework_failure diff --git a/tests/misc/head-pos b/tests/misc/head-pos index 8d5d00a27..fed1c23f2 100755 --- a/tests/misc/head-pos +++ b/tests/misc/head-pos @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && head --version +print_ver_ head (echo a; echo b) > in || framework_failure diff --git a/tests/misc/id-context b/tests/misc/id-context index 8e380944c..3b980ab02 100755 --- a/tests/misc/id-context +++ b/tests/misc/id-context @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && id --version +print_ver_ id # Require selinux - when selinux is disabled, id never prints scontext. require_selinux_ diff --git a/tests/misc/id-groups b/tests/misc/id-groups index 8a6eea34d..0f67d54c4 100755 --- a/tests/misc/id-groups +++ b/tests/misc/id-groups @@ -16,7 +16,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && id --version +print_ver_ id id -G $(id -nu) || fail=1 diff --git a/tests/misc/ls-time b/tests/misc/ls-time index 721fb8128..9e6c89e4a 100755 --- a/tests/misc/ls-time +++ b/tests/misc/ls-time @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ls --version +print_ver_ ls # Avoid any possible glitches due to daylight-saving changes near the # time stamps used during the test. diff --git a/tests/misc/md5sum-parallel b/tests/misc/md5sum-parallel index fdbc4c202..0e873b18e 100755 --- a/tests/misc/md5sum-parallel +++ b/tests/misc/md5sum-parallel @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && md5sum --version +print_ver_ md5sum (mkdir tmp && cd tmp && seq 500 | xargs touch) diff --git a/tests/misc/mknod b/tests/misc/mknod index 049ed0f72..15bb8bf45 100755 --- a/tests/misc/mknod +++ b/tests/misc/mknod @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mknod --version +print_ver_ mknod umask 777 diff --git a/tests/misc/nice b/tests/misc/nice index 939a9aa62..2948ce23e 100755 --- a/tests/misc/nice +++ b/tests/misc/nice @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && nice --version +print_ver_ nice tests=' 0 empty 10 diff --git a/tests/misc/nice-fail b/tests/misc/nice-fail index 6c8314c6b..b81fda611 100755 --- a/tests/misc/nice-fail +++ b/tests/misc/nice-fail @@ -18,7 +18,7 @@ . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && nice --version +print_ver_ nice # These tests verify exact status of internal failure. diff --git a/tests/misc/nl b/tests/misc/nl index 81d0a40de..36fdde5f2 100755 --- a/tests/misc/nl +++ b/tests/misc/nl @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && nl --version +print_ver_ nl echo a | nl > out || fail=1 diff --git a/tests/misc/nohup b/tests/misc/nohup index 9d3d76aa6..c7054c5f4 100755 --- a/tests/misc/nohup +++ b/tests/misc/nohup @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && nohup --version +print_ver_ nohup nohup sh -c 'echo stdout; echo stderr 1>&2' 2>err || fail=1 diff --git a/tests/misc/nproc-avail b/tests/misc/nproc-avail index 424bbe043..0802c5ca9 100755 --- a/tests/misc/nproc-avail +++ b/tests/misc/nproc-avail @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && nproc --version +print_ver_ nproc all=$(nproc --all) available=$(OMP_NUM_THREADS= nproc) diff --git a/tests/misc/nproc-positive b/tests/misc/nproc-positive index 1f12c9b96..2af66fabf 100755 --- a/tests/misc/nproc-positive +++ b/tests/misc/nproc-positive @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && nproc --version +print_ver_ nproc for mode in --all ''; do procs=$(nproc $mode) diff --git a/tests/misc/od-N b/tests/misc/od-N index 6d09f8e98..958f9568c 100755 --- a/tests/misc/od-N +++ b/tests/misc/od-N @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && od --version +print_ver_ od echo abcdefg > in || framework_failure diff --git a/tests/misc/od-multiple-t b/tests/misc/od-multiple-t index 0aecaf05b..665ab09c8 100755 --- a/tests/misc/od-multiple-t +++ b/tests/misc/od-multiple-t @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && od --version +print_ver_ od # Choose 48 bytes for the input, as that is lcm for 1, 2, 4, 8, 12, 16; # we don't anticipate any other native object size on modern hardware. diff --git a/tests/misc/od-x8 b/tests/misc/od-x8 index d9c933800..02a6966e7 100755 --- a/tests/misc/od-x8 +++ b/tests/misc/od-x8 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && od --version +print_ver_ od od -t x8 /dev/null >/dev/null || skip_test_ "od lacks support for 8-byte quantities" diff --git a/tests/misc/pathchk1 b/tests/misc/pathchk1 index ae32c9c29..394a94a5c 100755 --- a/tests/misc/pathchk1 +++ b/tests/misc/pathchk1 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && pathchk --version +print_ver_ pathchk skip_if_root_ touch file || framework_failure diff --git a/tests/misc/ptx-overrun b/tests/misc/ptx-overrun index 637c61d13..f4025bb9e 100755 --- a/tests/misc/ptx-overrun +++ b/tests/misc/ptx-overrun @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ptx --version +print_ver_ ptx # Using a long file name makes an abort more likely. # Even with no file name, valgrind detects the buffer overrun. diff --git a/tests/misc/readlink-fp-loop b/tests/misc/readlink-fp-loop index ab66fa12a..7492a9d0e 100755 --- a/tests/misc/readlink-fp-loop +++ b/tests/misc/readlink-fp-loop @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && readlink --version +print_ver_ readlink cwd=$("$abs_top_builddir/src/pwd") # To trigger this bug, we have to construct a name/situation during diff --git a/tests/misc/runcon-no-reorder b/tests/misc/runcon-no-reorder index ee20df041..9cbc78d8e 100755 --- a/tests/misc/runcon-no-reorder +++ b/tests/misc/runcon-no-reorder @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && runcon --version +print_ver_ runcon diag='runcon: runcon may be used only on a SELinux kernel' echo "$diag" > exp || framework_failure diff --git a/tests/misc/seq-long-double b/tests/misc/seq-long-double index e07ea82db..e687ac22c 100755 --- a/tests/misc/seq-long-double +++ b/tests/misc/seq-long-double @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && seq --version +print_ver_ seq getlimits_ # Run this test only with glibc and sizeof (long double) > sizeof (double). diff --git a/tests/misc/shred-exact b/tests/misc/shred-exact index 2aeef77ac..a1a8e1d74 100755 --- a/tests/misc/shred-exact +++ b/tests/misc/shred-exact @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && shred --version +print_ver_ shred for opt in --exact --zero; do diff --git a/tests/misc/shred-passes b/tests/misc/shred-passes index 2298553eb..a460785ab 100755 --- a/tests/misc/shred-passes +++ b/tests/misc/shred-passes @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && shred --version +print_ver_ shred # shred a single letter, zero length file which should result in diff --git a/tests/misc/shred-remove b/tests/misc/shred-remove index 0e2423cff..8f0218db0 100755 --- a/tests/misc/shred-remove +++ b/tests/misc/shred-remove @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && shred --version +print_ver_ shred skip_if_root_ # The length of the basename is what matters. diff --git a/tests/misc/shuf b/tests/misc/shuf index e612ee0bc..b828c84b5 100755 --- a/tests/misc/shuf +++ b/tests/misc/shuf @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && shuf --version +print_ver_ shuf seq 100 > in || framework_failure diff --git a/tests/misc/sort-benchmark-random b/tests/misc/sort-benchmark-random index 135534454..89fbc18f4 100755 --- a/tests/misc/sort-benchmark-random +++ b/tests/misc/sort-benchmark-random @@ -19,7 +19,7 @@ # Written by Glen Lenker. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort very_expensive_ diff --git a/tests/misc/sort-compress b/tests/misc/sort-compress index bba07604d..6692d0b61 100755 --- a/tests/misc/sort-compress +++ b/tests/misc/sort-compress @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort seq -w 2000 > exp || framework_failure tac exp > in || framework_failure diff --git a/tests/misc/sort-continue b/tests/misc/sort-continue index e4b8adfb3..95f2c488e 100755 --- a/tests/misc/sort-continue +++ b/tests/misc/sort-continue @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort # Skip the test when running under valgrind. ( ulimit -n 6; sort < /dev/null ) \ diff --git a/tests/misc/sort-debug-keys b/tests/misc/sort-debug-keys index ee65a7284..98710c1e7 100755 --- a/tests/misc/sort-debug-keys +++ b/tests/misc/sort-debug-keys @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort number() { cat -n | sed 's/^ *//'; } diff --git a/tests/misc/sort-debug-warn b/tests/misc/sort-debug-warn index 67668a135..40b8168da 100755 --- a/tests/misc/sort-debug-warn +++ b/tests/misc/sort-debug-warn @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort cat <<\EOF > exp sort: using simple byte comparison diff --git a/tests/misc/sort-float b/tests/misc/sort-float index bd6a9b88b..b818a936b 100755 --- a/tests/misc/sort-float +++ b/tests/misc/sort-float @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort # Return 0 if LDBL_MIN is smaller than DBL_MIN, else 1. # Dissect numbers like these, comparing first exponent, then diff --git a/tests/misc/sort-merge-fdlimit b/tests/misc/sort-merge-fdlimit index 89a408490..1ed50952f 100755 --- a/tests/misc/sort-merge-fdlimit +++ b/tests/misc/sort-merge-fdlimit @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort require_ulimit_ mkdir in err || framework_failure diff --git a/tests/misc/sort-month b/tests/misc/sort-month index c0fb2eb91..c241b5c8a 100755 --- a/tests/misc/sort-month +++ b/tests/misc/sort-month @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort locale --version >/dev/null 2>&1 || skip_test_ 'The locale utility is not present' diff --git a/tests/misc/sort-rand b/tests/misc/sort-rand index 07169e3c6..8fa3bc366 100755 --- a/tests/misc/sort-rand +++ b/tests/misc/sort-rand @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort seq 100 > in || framework_failure diff --git a/tests/misc/sort-unique b/tests/misc/sort-unique index e659febd0..c58b8a2ff 100755 --- a/tests/misc/sort-unique +++ b/tests/misc/sort-unique @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort cat > in <<\EOF 1 diff --git a/tests/misc/sort-version b/tests/misc/sort-version index e6a07c27b..1e7c51383 100755 --- a/tests/misc/sort-version +++ b/tests/misc/sort-version @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sort --version +print_ver_ sort cat > in << _EOF_ gcc-c++-10.fc9.tar.gz diff --git a/tests/misc/split-a b/tests/misc/split-a index 27269e2db..d861b9291 100755 --- a/tests/misc/split-a +++ b/tests/misc/split-a @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && split --version +print_ver_ split a_z='a b c d e f g h i j k l m n o p q r s t u v w x y z' diff --git a/tests/misc/split-fail b/tests/misc/split-fail index ec1941691..b0b22e4c4 100755 --- a/tests/misc/split-fail +++ b/tests/misc/split-fail @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && split --version +print_ver_ split getlimits_ touch in || framework_failure diff --git a/tests/misc/split-l b/tests/misc/split-l index 2e64a2c93..8967439e8 100755 --- a/tests/misc/split-l +++ b/tests/misc/split-l @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && ln --version +print_ver_ ln printf '1\n2\n3\n4\n5\n' > in || framework_failure diff --git a/tests/misc/stat-birthtime b/tests/misc/stat-birthtime index e584df02a..3c8478706 100755 --- a/tests/misc/stat-birthtime +++ b/tests/misc/stat-birthtime @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && stat --version +print_ver_ stat # Whether birthtime is supported or not, it better not change even when # [acm]time are modified. :) diff --git a/tests/misc/stat-fmt b/tests/misc/stat-fmt index 5e58ea46a..b297dcff5 100755 --- a/tests/misc/stat-fmt +++ b/tests/misc/stat-fmt @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && stat --version +print_ver_ stat diff --git a/tests/misc/stat-hyphen b/tests/misc/stat-hyphen index 2e0fdd29a..19cbe7a67 100755 --- a/tests/misc/stat-hyphen +++ b/tests/misc/stat-hyphen @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && stat --version +print_ver_ stat printf -- '-\n' > exp || framework_failure touch f || framework_failure diff --git a/tests/misc/stat-mount b/tests/misc/stat-mount index 039ce5040..c83e1b4b0 100755 --- a/tests/misc/stat-mount +++ b/tests/misc/stat-mount @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && stat --version +print_ver_ stat df_mnt=$(df -P . | sed -n '2s/.* \([^ ]*$\)/\1/p') stat_mnt=$(stat -c%m .) || fail=1 diff --git a/tests/misc/stat-nanoseconds b/tests/misc/stat-nanoseconds index cd2159644..de9030c81 100755 --- a/tests/misc/stat-nanoseconds +++ b/tests/misc/stat-nanoseconds @@ -16,7 +16,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -test "$VERBOSE" = yes && stat --version +print_ver_ stat . "${srcdir=.}/init.sh"; path_prepend_ ../src # Set this to avoid problems with weird time zones. diff --git a/tests/misc/stat-slash b/tests/misc/stat-slash index 4f0660f22..016fcb13a 100755 --- a/tests/misc/stat-slash +++ b/tests/misc/stat-slash @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && stat --version +print_ver_ stat touch file || framework_failure mkdir dir || framework_failure diff --git a/tests/misc/stty b/tests/misc/stty index cc1d933a3..6edab5c67 100755 --- a/tests/misc/stty +++ b/tests/misc/stty @@ -18,7 +18,7 @@ # Make sure there's a tty on stdin. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && stty --version +print_ver_ stty require_controlling_input_terminal_ trap '' TTOU # Ignore SIGTTOU diff --git a/tests/misc/stty-invalid b/tests/misc/stty-invalid index d80e3d413..b15d855ff 100755 --- a/tests/misc/stty-invalid +++ b/tests/misc/stty-invalid @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && stty --version +print_ver_ stty require_controlling_input_terminal_ trap '' TTOU # Ignore SIGTTOU diff --git a/tests/misc/stty-row-col b/tests/misc/stty-row-col index ed7fede97..152033448 100755 --- a/tests/misc/stty-row-col +++ b/tests/misc/stty-row-col @@ -29,7 +29,7 @@ LC_ALL=C export LC_ALL . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && stty --version +print_ver_ stty require_controlling_input_terminal_ trap '' TTOU # Ignore SIGTTOU diff --git a/tests/misc/su-fail b/tests/misc/su-fail index e8a0c5ff5..4e488806c 100755 --- a/tests/misc/su-fail +++ b/tests/misc/su-fail @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && su --version +print_ver_ su require_built_ su diff --git a/tests/misc/sum-sysv b/tests/misc/sum-sysv index 5465f213a..e8e31fd24 100755 --- a/tests/misc/sum-sysv +++ b/tests/misc/sum-sysv @@ -26,7 +26,7 @@ LC_ALL=C export LC_ALL . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && sum --version +print_ver_ sum # FYI, 16843009 is floor (2^32 / 255). diff --git a/tests/misc/tac-continue b/tests/misc/tac-continue index 59dddc83e..b13cb5cf1 100755 --- a/tests/misc/tac-continue +++ b/tests/misc/tac-continue @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tac --version +print_ver_ tac # See if the envvar is defined. if test x = "x$FULL_PARTITION_TMPDIR"; then diff --git a/tests/misc/tee b/tests/misc/tee index 9562966ae..34dae0972 100755 --- a/tests/misc/tee +++ b/tests/misc/tee @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tee --version +print_ver_ tee echo line >sample || framework_failure nums=`seq 9` || framework_failure diff --git a/tests/misc/tee-dash b/tests/misc/tee-dash index e72eadeef..bc85e0157 100755 --- a/tests/misc/tee-dash +++ b/tests/misc/tee-dash @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tee --version +print_ver_ tee tee - </dev/null || fail=1 diff --git a/tests/misc/timeout b/tests/misc/timeout index 8c9202613..7905f6676 100755 --- a/tests/misc/timeout +++ b/tests/misc/timeout @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && timeout --version +print_ver_ timeout # no timeout timeout 10 true || fail=1 diff --git a/tests/misc/timeout-parameters b/tests/misc/timeout-parameters index c5949e62b..37a34ddf4 100755 --- a/tests/misc/timeout-parameters +++ b/tests/misc/timeout-parameters @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && timeout --version +print_ver_ timeout getlimits_ diff --git a/tests/misc/tr-case-class b/tests/misc/tr-case-class index 14c6b0ea0..0c2acc606 100755 --- a/tests/misc/tr-case-class +++ b/tests/misc/tr-case-class @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tr --version +print_ver_ tr # Ensure we support translation of case classes with extension echo '01234567899999999999999999' > exp diff --git a/tests/misc/truncate-dangling-symlink b/tests/misc/truncate-dangling-symlink index 801b55d17..83c88e1d5 100755 --- a/tests/misc/truncate-dangling-symlink +++ b/tests/misc/truncate-dangling-symlink @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && truncate --version +print_ver_ truncate ln -s truncate-target t-symlink diff --git a/tests/misc/truncate-dir-fail b/tests/misc/truncate-dir-fail index cc94dc4bc..c10e959b1 100755 --- a/tests/misc/truncate-dir-fail +++ b/tests/misc/truncate-dir-fail @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && truncate --version +print_ver_ truncate # truncate on dir not allowed truncate -s+0 . && fail=1 diff --git a/tests/misc/truncate-fail-diag b/tests/misc/truncate-fail-diag index 68a384236..d6c3b3bca 100755 --- a/tests/misc/truncate-fail-diag +++ b/tests/misc/truncate-fail-diag @@ -21,7 +21,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && truncate --version +print_ver_ truncate skip_if_root_ diff --git a/tests/misc/truncate-fifo b/tests/misc/truncate-fifo index 469ba5e97..0c732a7a2 100755 --- a/tests/misc/truncate-fifo +++ b/tests/misc/truncate-fifo @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && truncate --version +print_ver_ truncate mkfifo_or_skip_ fifo diff --git a/tests/misc/truncate-no-create-missing b/tests/misc/truncate-no-create-missing index c5a87c2d0..a84b0d55c 100755 --- a/tests/misc/truncate-no-create-missing +++ b/tests/misc/truncate-no-create-missing @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && truncate --version +print_ver_ truncate # truncate -c no-such-file should not fail. diff --git a/tests/misc/truncate-overflow b/tests/misc/truncate-overflow index 991c1c83f..a5c67501e 100755 --- a/tests/misc/truncate-overflow +++ b/tests/misc/truncate-overflow @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && truncate --version +print_ver_ truncate getlimits_ diff --git a/tests/misc/truncate-owned-by-other b/tests/misc/truncate-owned-by-other index 88aa63cbe..9ad4d6a17 100755 --- a/tests/misc/truncate-owned-by-other +++ b/tests/misc/truncate-owned-by-other @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && truncate --version +print_ver_ truncate require_root_ diff --git a/tests/misc/truncate-parameters b/tests/misc/truncate-parameters index 980ebffab..858c9d3fe 100755 --- a/tests/misc/truncate-parameters +++ b/tests/misc/truncate-parameters @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && truncate --version +print_ver_ truncate # must specify at least 1 file diff --git a/tests/misc/truncate-relative b/tests/misc/truncate-relative index a82fd9c32..5e57264db 100755 --- a/tests/misc/truncate-relative +++ b/tests/misc/truncate-relative @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && truncate --version +print_ver_ truncate # mixture of relative modifiers not allowed diff --git a/tests/misc/wc-files0 b/tests/misc/wc-files0 index 7d3634e95..5eaccc947 100755 --- a/tests/misc/wc-files0 +++ b/tests/misc/wc-files0 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && wc --version +print_ver_ wc echo 2 > 2b || framework_failure echo 2 words > 2w || framework_failure diff --git a/tests/misc/wc-parallel b/tests/misc/wc-parallel index fd809f5f2..159da943c 100755 --- a/tests/misc/wc-parallel +++ b/tests/misc/wc-parallel @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && md5sum --version +print_ver_ md5sum (mkdir tmp && cd tmp && seq 2000 | xargs touch) diff --git a/tests/mkdir/p-1 b/tests/mkdir/p-1 index 9c8e8a5d8..060c05af8 100755 --- a/tests/mkdir/p-1 +++ b/tests/mkdir/p-1 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir mkdir --parents "`pwd`/t" || fail=1 test -d t || fail=1 diff --git a/tests/mkdir/p-2 b/tests/mkdir/p-2 index 735d7ad08..38c0adf56 100755 --- a/tests/mkdir/p-2 +++ b/tests/mkdir/p-2 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir mkdir --parents "`pwd`/t/u" || fail=1 test -d t/u || fail=1 diff --git a/tests/mkdir/p-3 b/tests/mkdir/p-3 index ddc812e0e..bcfcf9552 100755 --- a/tests/mkdir/p-3 +++ b/tests/mkdir/p-3 @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir skip_if_root_ mkdir no-access || framework_failure diff --git a/tests/mkdir/p-slashdot b/tests/mkdir/p-slashdot index fba112df2..6f3d3542d 100755 --- a/tests/mkdir/p-slashdot +++ b/tests/mkdir/p-slashdot @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir mkdir -p d1/. || fail=1 diff --git a/tests/mkdir/p-thru-slink b/tests/mkdir/p-thru-slink index e2cc9c93f..feb073837 100755 --- a/tests/mkdir/p-thru-slink +++ b/tests/mkdir/p-thru-slink @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir ln -s . slink || framework_failure diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v index aeae33da9..d4a553669 100755 --- a/tests/mkdir/p-v +++ b/tests/mkdir/p-v @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir mkdir -pv foo/a/b/c/d >out || fail=1 diff --git a/tests/mkdir/parents b/tests/mkdir/parents index 951b6f9e0..56e106d44 100755 --- a/tests/mkdir/parents +++ b/tests/mkdir/parents @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir skip_if_setgid_ mkdir -m 700 e-dir || framework_failure diff --git a/tests/mkdir/perm b/tests/mkdir/perm index 0cd0a5581..878e46509 100755 --- a/tests/mkdir/perm +++ b/tests/mkdir/perm @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir skip_if_setgid_ working_umask_or_skip_ diff --git a/tests/mkdir/special-1 b/tests/mkdir/special-1 index 7ed437021..cea2081ac 100755 --- a/tests/mkdir/special-1 +++ b/tests/mkdir/special-1 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir set_mode_string=u=rwx,g=rx,o=w,-s,+t output_mode_string=drwxr-x-wT diff --git a/tests/mkdir/t-slash b/tests/mkdir/t-slash index ed72880c7..d23c89b7c 100755 --- a/tests/mkdir/t-slash +++ b/tests/mkdir/t-slash @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir mkdir -p dir/ || fail=1 diff --git a/tests/mkdir/writable-under-readonly b/tests/mkdir/writable-under-readonly index 2c8ac52f4..85de287a3 100755 --- a/tests/mkdir/writable-under-readonly +++ b/tests/mkdir/writable-under-readonly @@ -25,7 +25,7 @@ # Demonstrate the problem, as root: . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mkdir --version +print_ver_ mkdir require_root_ # FIXME: for now, skip it unconditionally diff --git a/tests/mv/atomic b/tests/mv/atomic index 5df2d60fd..c75e62bb4 100755 --- a/tests/mv/atomic +++ b/tests/mv/atomic @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv require_strace_ unlink # Before the fix, mv would unnecessarily unlink the destination symlink: diff --git a/tests/mv/atomic2 b/tests/mv/atomic2 index 4bc0e73fe..947f6b012 100755 --- a/tests/mv/atomic2 +++ b/tests/mv/atomic2 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv require_strace_ unlink # Before the fix, mv would unnecessarily unlink the destination symlink: diff --git a/tests/mv/backup-dir b/tests/mv/backup-dir index a96edc680..c577883e4 100755 --- a/tests/mv/backup-dir +++ b/tests/mv/backup-dir @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv mkdir A B || framework_failure touch X Y || framework_failure diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src index fe5c68049..9145b008a 100755 --- a/tests/mv/backup-is-src +++ b/tests/mv/backup-is-src @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/mv/diag b/tests/mv/diag index d32513d9b..5a31c0be5 100755 --- a/tests/mv/diag +++ b/tests/mv/diag @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv touch f1 || framework_failure touch f2 || framework_failure diff --git a/tests/mv/dir-file b/tests/mv/dir-file index ebe2a673f..9fd125f0a 100755 --- a/tests/mv/dir-file +++ b/tests/mv/dir-file @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv mkdir -p dir/file || framework_failure > file || framework_failure diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir index de7770b5d..915a0fbc5 100755 --- a/tests/mv/dir2dir +++ b/tests/mv/dir2dir @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv mkdir -p a/t b/t || framework_failure touch a/t/f || framework_failure diff --git a/tests/mv/force b/tests/mv/force index 708efcbf4..08c5cf750 100755 --- a/tests/mv/force +++ b/tests/mv/force @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv ff=mvforce ff2=mvforce2 diff --git a/tests/mv/hard-3 b/tests/mv/hard-3 index 61d71c1fa..eb69b02e7 100755 --- a/tests/mv/hard-3 +++ b/tests/mv/hard-3 @@ -31,7 +31,7 @@ # mv enables by default. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && cp --version +print_ver_ cp skip_if_root_ mkdir -p x dst/x || framework_failure diff --git a/tests/mv/hard-4 b/tests/mv/hard-4 index b22969eb4..476464090 100755 --- a/tests/mv/hard-4 +++ b/tests/mv/hard-4 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv touch a || framework_failure ln a b || framework_failure diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1 index 3d7c6abf0..b03d9268e 100755 --- a/tests/mv/hard-link-1 +++ b/tests/mv/hard-link-1 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose index 8c0dfe0fa..5a057b42c 100755 --- a/tests/mv/hard-verbose +++ b/tests/mv/hard-verbose @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv touch x || framework_failure ln x y || framework_failure diff --git a/tests/mv/i-3 b/tests/mv/i-3 index fededda97..983aad945 100755 --- a/tests/mv/i-3 +++ b/tests/mv/i-3 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv require_controlling_input_terminal_ skip_if_root_ trap '' TTIN # Ignore SIGTTIN diff --git a/tests/mv/i-4 b/tests/mv/i-4 index d5d746561..72d0f1161 100755 --- a/tests/mv/i-4 +++ b/tests/mv/i-4 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv for i in a b; do echo $i > $i || framework_failure diff --git a/tests/mv/i-5 b/tests/mv/i-5 index e73d4b209..bcf3fd910 100755 --- a/tests/mv/i-5 +++ b/tests/mv/i-5 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv mkdir a || framework_failure touch b || framework_failure diff --git a/tests/mv/i-link-no b/tests/mv/i-link-no index 2d7630109..471765d7f 100755 --- a/tests/mv/i-link-no +++ b/tests/mv/i-link-no @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv mkdir a b || framework_failure echo foo > a/foo || framework_failure diff --git a/tests/mv/into-self b/tests/mv/into-self index 2c28a2f71..42786bd10 100755 --- a/tests/mv/into-self +++ b/tests/mv/into-self @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv dir=toself-dir file=toself-file diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2 index c5d1bd5c4..1bd90e065 100755 --- a/tests/mv/into-self-2 +++ b/tests/mv/into-self-2 @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3 index 8a506626c..8a82e8914 100755 --- a/tests/mv/into-self-3 +++ b/tests/mv/into-self-3 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv dir1=is3-dir1 dir2=is3-dir2 diff --git a/tests/mv/into-self-4 b/tests/mv/into-self-4 index 18a32dc59..ed4d4f5e8 100755 --- a/tests/mv/into-self-4 +++ b/tests/mv/into-self-4 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv touch file || framework_failure ln -s file s || framework_failure diff --git a/tests/mv/leak-fd b/tests/mv/leak-fd index 3155397e7..229c63ef4 100755 --- a/tests/mv/leak-fd +++ b/tests/mv/leak-fd @@ -19,7 +19,7 @@ # limit so don't run it by default. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv skip_if_root_ cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/mv/mv-n b/tests/mv/mv-n index 32739dd9f..8cbf1b965 100755 --- a/tests/mv/mv-n +++ b/tests/mv/mv-n @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv # test miscellaneous combinations of -f -i -n parameters diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1 index fe10acda7..8e7bfcd21 100755 --- a/tests/mv/mv-special-1 +++ b/tests/mv/mv-special-1 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/mv/no-target-dir b/tests/mv/no-target-dir index f1d886ba5..56930fd65 100755 --- a/tests/mv/no-target-dir +++ b/tests/mv/no-target-dir @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv mkdir -p d/sub empty src d2/sub e2 || framework_failure touch f || framework_failure diff --git a/tests/mv/part-fail b/tests/mv/part-fail index c167076af..2d80f599d 100755 --- a/tests/mv/part-fail +++ b/tests/mv/part-fail @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv skip_if_root_ cleanup_() { t=$other_partition_tmpdir; chmod -R 700 "$t"; rm -rf "$t"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/mv/part-hardlink b/tests/mv/part-hardlink index b97b0a0b5..8eaf5cd68 100755 --- a/tests/mv/part-hardlink +++ b/tests/mv/part-hardlink @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/mv/part-rename b/tests/mv/part-rename index 3f18045b4..41e60fb80 100755 --- a/tests/mv/part-rename +++ b/tests/mv/part-rename @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm index 01b1697d4..d04363021 100755 --- a/tests/mv/partition-perm +++ b/tests/mv/partition-perm @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/mv/perm-1 b/tests/mv/perm-1 index fda23ed2d..944f63136 100755 --- a/tests/mv/perm-1 +++ b/tests/mv/perm-1 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv skip_if_root_ mkdir -p no-write/dir || framework_failure diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart index 513c32565..dbb558483 100755 --- a/tests/mv/sticky-to-xpart +++ b/tests/mv/sticky-to-xpart @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv require_root_ cleanup_() { rm -rf "$other_partition_tmpdir"; } diff --git a/tests/mv/to-symlink b/tests/mv/to-symlink index 5530eee4f..26b7a275a 100755 --- a/tests/mv/to-symlink +++ b/tests/mv/to-symlink @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_srcdir/other-fs-tmpdir" diff --git a/tests/mv/trailing-slash b/tests/mv/trailing-slash index b0b362c8f..b58c90822 100755 --- a/tests/mv/trailing-slash +++ b/tests/mv/trailing-slash @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && mv --version +print_ver_ mv mkdir foo || framework_failure diff --git a/tests/readlink/can-e b/tests/readlink/can-e index d7e934e39..2d2868d0f 100755 --- a/tests/readlink/can-e +++ b/tests/readlink/can-e @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && readlink --version +print_ver_ readlink pwd=`pwd` my_pwd=$("$abs_top_builddir/src/pwd") diff --git a/tests/readlink/can-f b/tests/readlink/can-f index a5020e646..7ed5b0866 100755 --- a/tests/readlink/can-f +++ b/tests/readlink/can-f @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && readlink --version +print_ver_ readlink pwd=`pwd` my_pwd=$("$abs_top_builddir/src/pwd") diff --git a/tests/readlink/can-m b/tests/readlink/can-m index cf7c994bd..b5cfc1d5e 100755 --- a/tests/readlink/can-m +++ b/tests/readlink/can-m @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && readlink --version +print_ver_ readlink pwd=`pwd` my_pwd=$("$abs_top_builddir/src/pwd") diff --git a/tests/readlink/rl-1 b/tests/readlink/rl-1 index 36dde3dc2..0b0359588 100755 --- a/tests/readlink/rl-1 +++ b/tests/readlink/rl-1 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && readlink --version +print_ver_ readlink mkdir subdir || framework_failure touch regfile || framework_failure diff --git a/tests/rm/cycle b/tests/rm/cycle index 4af7afee3..709969a25 100755 --- a/tests/rm/cycle +++ b/tests/rm/cycle @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ mkdir -p a/b diff --git a/tests/rm/dangling-symlink b/tests/rm/dangling-symlink index b082901a6..13dfea870 100755 --- a/tests/rm/dangling-symlink +++ b/tests/rm/dangling-symlink @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm ln -s no-file dangle ln -s / symlink diff --git a/tests/rm/deep-1 b/tests/rm/deep-1 index b21e1e603..8ce291c77 100755 --- a/tests/rm/deep-1 +++ b/tests/rm/deep-1 @@ -24,7 +24,7 @@ # If this test takes too long on your system, blame the OS. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm umask 022 diff --git a/tests/rm/deep-2 b/tests/rm/deep-2 index c90f60730..4e1b27b48 100755 --- a/tests/rm/deep-2 +++ b/tests/rm/deep-2 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm # Root can run this test, but it always succeeds, since for root, all # files are writable, and write_protected_non_symlink never reaches diff --git a/tests/rm/dir-no-w b/tests/rm/dir-no-w index 8dc19d4fa..ae38062bc 100755 --- a/tests/rm/dir-no-w +++ b/tests/rm/dir-no-w @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir --mode=0500 unwritable-dir || framework_failure diff --git a/tests/rm/dir-nonrecur b/tests/rm/dir-nonrecur index 816b72d18..3ed2d0ab2 100755 --- a/tests/rm/dir-nonrecur +++ b/tests/rm/dir-nonrecur @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir d || framework_failure diff --git a/tests/rm/dot-rel b/tests/rm/dot-rel index 81d405a72..910ed507f 100755 --- a/tests/rm/dot-rel +++ b/tests/rm/dot-rel @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir a b || framework_failure touch a/f b/f || framework_failure diff --git a/tests/rm/empty-inacc b/tests/rm/empty-inacc index 3aef6abaa..573fd24fe 100755 --- a/tests/rm/empty-inacc +++ b/tests/rm/empty-inacc @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ mkdir -m0 inacc || framework_failure diff --git a/tests/rm/ext3-perf b/tests/rm/ext3-perf index 155de1828..3fa4e912f 100755 --- a/tests/rm/ext3-perf +++ b/tests/rm/ext3-perf @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm very_expensive_ diff --git a/tests/rm/f-1 b/tests/rm/f-1 index 6400d5b84..4511cbea6 100755 --- a/tests/rm/f-1 +++ b/tests/rm/f-1 @@ -19,7 +19,7 @@ test=f-1 . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir -p d || framework_failure diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm index 0085d1f48..416c97e98 100755 --- a/tests/rm/fail-2eperm +++ b/tests/rm/fail-2eperm @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm require_root_ # The containing directory must be owned by the user who eventually runs rm. diff --git a/tests/rm/fail-eacces b/tests/rm/fail-eacces index fc20bd69e..3010a007b 100755 --- a/tests/rm/fail-eacces +++ b/tests/rm/fail-eacces @@ -20,7 +20,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ ok=0 diff --git a/tests/rm/hash b/tests/rm/hash index 8a4d66154..fafafdcfe 100755 --- a/tests/rm/hash +++ b/tests/rm/hash @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm expensive_ # Create a hierarchy with 3*26 leaf directories, each at depth 153. diff --git a/tests/rm/i-1 b/tests/rm/i-1 index 20e88e875..fdcbecbdc 100755 --- a/tests/rm/i-1 +++ b/tests/rm/i-1 @@ -19,7 +19,7 @@ test=i-1 . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm t=t mkdir -p $t || framework_failure diff --git a/tests/rm/i-never b/tests/rm/i-never index b00d3ef1b..1c9fe8470 100755 --- a/tests/rm/i-never +++ b/tests/rm/i-never @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ touch f || framework_failure diff --git a/tests/rm/i-no-r b/tests/rm/i-no-r index 3178a9843..896949da6 100755 --- a/tests/rm/i-no-r +++ b/tests/rm/i-no-r @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir dir || framework_failure echo y > y || framework_failure diff --git a/tests/rm/ignorable b/tests/rm/ignorable index 9028de8dc..00fc24f0a 100755 --- a/tests/rm/ignorable +++ b/tests/rm/ignorable @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ touch existing-non-dir || framework_failure diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible index 6e09de67a..bdc1d443f 100755 --- a/tests/rm/inaccessible +++ b/tests/rm/inaccessible @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm # Skip this test if your system has neither the openat-style functions # nor /proc/self/fd support with which to emulate them. diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always index 9e15e2258..7a1297046 100755 --- a/tests/rm/interactive-always +++ b/tests/rm/interactive-always @@ -19,7 +19,7 @@ test=interactive-always . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm touch file1-1 file1-2 file2-1 file2-2 file3-1 file3-2 file4-1 file4-2 \ || framework_failure diff --git a/tests/rm/interactive-once b/tests/rm/interactive-once index 48086d704..facef7c79 100755 --- a/tests/rm/interactive-once +++ b/tests/rm/interactive-once @@ -19,7 +19,7 @@ test=interactive-once . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir -p dir1-1 dir2-1 dir2-2 || framework_failure touch file1-1 file2-1 file2-2 file2-3 file3-1 file3-2 file3-3 file3-4 \ diff --git a/tests/rm/ir-1 b/tests/rm/ir-1 index b48fa948b..51cacad21 100755 --- a/tests/rm/ir-1 +++ b/tests/rm/ir-1 @@ -19,7 +19,7 @@ test=ir-1 . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm t=t mkdir -p $t $t/a $t/b $t/c || framework_failure diff --git a/tests/rm/isatty b/tests/rm/isatty index 1b18654cb..a6e533537 100755 --- a/tests/rm/isatty +++ b/tests/rm/isatty @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up index e85196ce7..70a9ee381 100755 --- a/tests/rm/no-give-up +++ b/tests/rm/no-give-up @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm require_root_ mkdir d || framework_failure diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system index 371607be6..a8cae48ac 100755 --- a/tests/rm/one-file-system +++ b/tests/rm/one-file-system @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm require_root_ cleanup_() diff --git a/tests/rm/one-file-system2 b/tests/rm/one-file-system2 index 83a9cecee..279c3115e 100755 --- a/tests/rm/one-file-system2 +++ b/tests/rm/one-file-system2 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir -p a/b diff --git a/tests/rm/r-1 b/tests/rm/r-1 index e07881b0e..fb9eab221 100755 --- a/tests/rm/r-1 +++ b/tests/rm/r-1 @@ -20,7 +20,7 @@ test=r-1 . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir a a/a || framework_failure > b || framework_failure diff --git a/tests/rm/r-2 b/tests/rm/r-2 index 485620fe4..91a12096e 100755 --- a/tests/rm/r-2 +++ b/tests/rm/r-2 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir t t/a t/a/b || framework_failure > t/a/f || framework_failure diff --git a/tests/rm/r-3 b/tests/rm/r-3 index 829685055..c00529cf1 100755 --- a/tests/rm/r-3 +++ b/tests/rm/r-3 @@ -24,7 +24,7 @@ # are 338 or more files in a directory on a Darwin-6.5 system . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir t || framework_failure cd t || framework_failure diff --git a/tests/rm/r-4 b/tests/rm/r-4 index c8d3f9bc7..e7bb9a832 100755 --- a/tests/rm/r-4 +++ b/tests/rm/r-4 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir d || framework_failure touch d/a || framework_failure diff --git a/tests/rm/read-only b/tests/rm/read-only index c54259469..4cbd54860 100755 --- a/tests/rm/read-only +++ b/tests/rm/read-only @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm require_root_ cwd=`pwd` diff --git a/tests/rm/readdir-bug b/tests/rm/readdir-bug index be3e546c0..2c813b9e1 100755 --- a/tests/rm/readdir-bug +++ b/tests/rm/readdir-bug @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm # Create a directory containing many files. # What counts is a combination of the number of files and diff --git a/tests/rm/rm1 b/tests/rm/rm1 index 46ae76971..23456d053 100755 --- a/tests/rm/rm1 +++ b/tests/rm/rm1 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ mkdir -p b/a/p b/c b/d || framework_failure diff --git a/tests/rm/rm2 b/tests/rm/rm2 index 11b153fee..32aaf8c30 100755 --- a/tests/rm/rm2 +++ b/tests/rm/rm2 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ mkdir -p a/0 || framework_failure diff --git a/tests/rm/rm3 b/tests/rm/rm3 index b62dec603..1c3f2b9b2 100755 --- a/tests/rm/rm3 +++ b/tests/rm/rm3 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ mkdir -p z || framework_failure diff --git a/tests/rm/rm4 b/tests/rm/rm4 index 571fdb019..f9f4e8fd3 100755 --- a/tests/rm/rm4 +++ b/tests/rm/rm4 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ mkdir dir || framework_failure diff --git a/tests/rm/rm5 b/tests/rm/rm5 index 1d27f7cda..a6f6fc424 100755 --- a/tests/rm/rm5 +++ b/tests/rm/rm5 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ mkdir -p d/e || framework_failure diff --git a/tests/rm/sunos-1 b/tests/rm/sunos-1 index 3057ecbbd..846ca20c6 100755 --- a/tests/rm/sunos-1 +++ b/tests/rm/sunos-1 @@ -23,7 +23,7 @@ # but relative to `/' rather than relative to the current directory. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm rm -r '' > /dev/null 2>&1 && fail=1 diff --git a/tests/rm/unread2 b/tests/rm/unread2 index 69c27474e..a67298362 100755 --- a/tests/rm/unread2 +++ b/tests/rm/unread2 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ mkdir -p a/b || framework_failure diff --git a/tests/rm/unread3 b/tests/rm/unread3 index a2782bbba..a95562d13 100755 --- a/tests/rm/unread3 +++ b/tests/rm/unread3 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm skip_if_root_ mkdir -p a/1 b c d/2 e/3 || framework_failure diff --git a/tests/rm/v-slash b/tests/rm/v-slash index a9ab828bc..7734df7b8 100755 --- a/tests/rm/v-slash +++ b/tests/rm/v-slash @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rm --version +print_ver_ rm mkdir a || framework_failure touch a/x || framework_failure diff --git a/tests/rmdir/fail-perm b/tests/rmdir/fail-perm index 8c37f8d90..bf1245f70 100755 --- a/tests/rmdir/fail-perm +++ b/tests/rmdir/fail-perm @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rmdir --version +print_ver_ rmdir mkdir d d/e d/e/f || framework_failure chmod a-w d || framework_failure diff --git a/tests/rmdir/ignore b/tests/rmdir/ignore index 08183607e..ffd0090fc 100755 --- a/tests/rmdir/ignore +++ b/tests/rmdir/ignore @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rmdir --version +print_ver_ rmdir cwd=`pwd` mkdir -p "$cwd/a/b/c" "$cwd/a/x" || framework_failure diff --git a/tests/rmdir/t-slash b/tests/rmdir/t-slash index f7d1f0dce..f83b6283d 100755 --- a/tests/rmdir/t-slash +++ b/tests/rmdir/t-slash @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && rmdir --version +print_ver_ rmdir mkdir dir || framework_failure diff --git a/tests/sample-test b/tests/sample-test index 27dc3b2ea..a12fe49b6 100644 --- a/tests/sample-test +++ b/tests/sample-test @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && FIXME --version +print_ver_ FIXME # FIXME: skip_if_root_ # FIXME: require_root_ diff --git a/tests/tail-2/F-vs-missing b/tests/tail-2/F-vs-missing index 8c1d01898..50e8ab4b7 100755 --- a/tests/tail-2/F-vs-missing +++ b/tests/tail-2/F-vs-missing @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail debug='---disable-inotify' debug= diff --git a/tests/tail-2/F-vs-rename b/tests/tail-2/F-vs-rename index 98b36e745..93971d251 100755 --- a/tests/tail-2/F-vs-rename +++ b/tests/tail-2/F-vs-rename @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail touch a b || framework_failure diff --git a/tests/tail-2/append-only b/tests/tail-2/append-only index 32578fe57..e99bff2a2 100755 --- a/tests/tail-2/append-only +++ b/tests/tail-2/append-only @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail require_root_ chattr_a_works=1 diff --git a/tests/tail-2/assert b/tests/tail-2/assert index 1fdb76a77..560f6c7ce 100755 --- a/tests/tail-2/assert +++ b/tests/tail-2/assert @@ -24,7 +24,7 @@ # due to a race condition in which a dev/inode pair is reused. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail # Not "expensive" per se, but sleeping for so long is annoying. very_expensive_ diff --git a/tests/tail-2/assert-2 b/tests/tail-2/assert-2 index fec0525ed..decbaaecb 100755 --- a/tests/tail-2/assert-2 +++ b/tests/tail-2/assert-2 @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail # Not "expensive" per se, but sleeping for so long is annoying. very_expensive_ diff --git a/tests/tail-2/big-4gb b/tests/tail-2/big-4gb index 3496a622f..a32eaaa4a 100755 --- a/tests/tail-2/big-4gb +++ b/tests/tail-2/big-4gb @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail expensive_ # Create a file of size exactly 4GB (2^32) with 8 bytes diff --git a/tests/tail-2/flush-initial b/tests/tail-2/flush-initial index df8810dcc..14a4f7bb0 100755 --- a/tests/tail-2/flush-initial +++ b/tests/tail-2/flush-initial @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail echo line > in || fail=1 # Output should be buffered since we're writing to file diff --git a/tests/tail-2/follow-stdin b/tests/tail-2/follow-stdin index 1c50e8b66..0b39bc696 100755 --- a/tests/tail-2/follow-stdin +++ b/tests/tail-2/follow-stdin @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail echo line > exp || framework_failure echo line > in || framework_failure diff --git a/tests/tail-2/infloop-1 b/tests/tail-2/infloop-1 index 7e98daf6a..38ee6f1f1 100755 --- a/tests/tail-2/infloop-1 +++ b/tests/tail-2/infloop-1 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail yes > t & yes_pid=$! diff --git a/tests/tail-2/inotify-hash-abuse b/tests/tail-2/inotify-hash-abuse index d45668a69..86454c5fd 100755 --- a/tests/tail-2/inotify-hash-abuse +++ b/tests/tail-2/inotify-hash-abuse @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail # 9 is a magic number, related to internal details of tail.c and hash.c n=9 diff --git a/tests/tail-2/inotify-hash-abuse2 b/tests/tail-2/inotify-hash-abuse2 index f3018a57a..abd101cca 100755 --- a/tests/tail-2/inotify-hash-abuse2 +++ b/tests/tail-2/inotify-hash-abuse2 @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail touch f || framework_failure diff --git a/tests/tail-2/inotify-race b/tests/tail-2/inotify-race index 2deff69ae..8ff388b64 100755 --- a/tests/tail-2/inotify-race +++ b/tests/tail-2/inotify-race @@ -21,7 +21,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail # Don't run this test by default because sometimes it's skipped as noted below. # Also gdb has a bug in Debian's gdb-6.8-3 at least that causes it to not diff --git a/tests/tail-2/pid b/tests/tail-2/pid index b684a3617..a1fa58c4b 100755 --- a/tests/tail-2/pid +++ b/tests/tail-2/pid @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail getlimits_ touch empty here || framework_failure diff --git a/tests/tail-2/pipe-f b/tests/tail-2/pipe-f index b6fef16d7..ae68a5f6f 100755 --- a/tests/tail-2/pipe-f +++ b/tests/tail-2/pipe-f @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail echo foo | timeout 10 tail -f -c3 > out || fail=1 echo oo > exp || fail=1 diff --git a/tests/tail-2/pipe-f2 b/tests/tail-2/pipe-f2 index 426f37b50..0b9fd283c 100755 --- a/tests/tail-2/pipe-f2 +++ b/tests/tail-2/pipe-f2 @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail mkfifo_or_skip_ fifo diff --git a/tests/tail-2/proc-ksyms b/tests/tail-2/proc-ksyms index 3e63bfed8..ae0074063 100755 --- a/tests/tail-2/proc-ksyms +++ b/tests/tail-2/proc-ksyms @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail ksyms=/proc/ksyms diff --git a/tests/tail-2/start-middle b/tests/tail-2/start-middle index 404562d88..4727371fa 100755 --- a/tests/tail-2/start-middle +++ b/tests/tail-2/start-middle @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail (echo 1; echo 2) > k || framework_failure diff --git a/tests/tail-2/tail-n0f b/tests/tail-2/tail-n0f index d7badd74f..007e5d770 100755 --- a/tests/tail-2/tail-n0f +++ b/tests/tail-2/tail-n0f @@ -22,7 +22,7 @@ # file, or if its contents don't look right. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail require_proc_pid_status_ diff --git a/tests/tail-2/wait b/tests/tail-2/wait index 36cfa0e8c..a1c7fcdf8 100755 --- a/tests/tail-2/wait +++ b/tests/tail-2/wait @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && tail --version +print_ver_ tail touch here || framework_failure { touch unreadable && chmod a-r unreadable; } || framework_failure diff --git a/tests/touch/60-seconds b/tests/touch/60-seconds index e50c25765..9e94d4789 100755 --- a/tests/touch/60-seconds +++ b/tests/touch/60-seconds @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch echo 60.000000000 > exp || framework_failure diff --git a/tests/touch/dangling-symlink b/tests/touch/dangling-symlink index 55466c439..a81b4bcdb 100755 --- a/tests/touch/dangling-symlink +++ b/tests/touch/dangling-symlink @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch rm -f touch-target t-symlink ln -s touch-target t-symlink diff --git a/tests/touch/dir-1 b/tests/touch/dir-1 index 2d61bb58f..b4c04fe41 100755 --- a/tests/touch/dir-1 +++ b/tests/touch/dir-1 @@ -3,7 +3,7 @@ # This was broken in the 4.0[efg] test releases. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch touch . || fail=1 Exit $fail diff --git a/tests/touch/empty-file b/tests/touch/empty-file index e93bf0ac0..e927d4aa9 100755 --- a/tests/touch/empty-file +++ b/tests/touch/empty-file @@ -22,7 +22,7 @@ # the empty file is on an NFS-mounted 4.2 volume. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch DEFAULT_SLEEP_SECONDS=2 SLEEP_SECONDS=${SLEEP_SECONDS=$DEFAULT_SLEEP_SECONDS} diff --git a/tests/touch/fail-diag b/tests/touch/fail-diag index a957a8fdb..11f67847f 100755 --- a/tests/touch/fail-diag +++ b/tests/touch/fail-diag @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch skip_if_root_ d1=no-$$ diff --git a/tests/touch/fifo b/tests/touch/fifo index e6743d166..bf1f0ab5d 100755 --- a/tests/touch/fifo +++ b/tests/touch/fifo @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch mkfifo_or_skip_ fifo diff --git a/tests/touch/no-create-missing b/tests/touch/no-create-missing index 96aa09232..a81560fbb 100755 --- a/tests/touch/no-create-missing +++ b/tests/touch/no-create-missing @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch touch -c no-file > /dev/null 2>&1 || fail=1 diff --git a/tests/touch/no-dereference b/tests/touch/no-dereference index 95002e567..ce6623ec1 100755 --- a/tests/touch/no-dereference +++ b/tests/touch/no-dereference @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch ln -s nowhere dangling || framework_failure touch file || framework_failure diff --git a/tests/touch/no-rights b/tests/touch/no-rights index d2032550b..c041edbf3 100755 --- a/tests/touch/no-rights +++ b/tests/touch/no-rights @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch # Make sure t2 is newer than t1. touch -d '2000-01-01 00:00' t1 || framework_failure diff --git a/tests/touch/not-owner b/tests/touch/not-owner index 9645f4dbd..ea4b54c55 100755 --- a/tests/touch/not-owner +++ b/tests/touch/not-owner @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch if env -- test -w /; then skip_test_ you have write access to /. diff --git a/tests/touch/now-owned-by-other b/tests/touch/now-owned-by-other index c7215022c..c475903a2 100755 --- a/tests/touch/now-owned-by-other +++ b/tests/touch/now-owned-by-other @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch require_root_ group_num=$(id -g $NON_ROOT_USERNAME) diff --git a/tests/touch/obsolescent b/tests/touch/obsolescent index 9821fc1e4..20c398dae 100755 --- a/tests/touch/obsolescent +++ b/tests/touch/obsolescent @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch _POSIX2_VERSION=199209; export _POSIX2_VERSION POSIXLY_CORRECT=1; export POSIXLY_CORRECT diff --git a/tests/touch/read-only b/tests/touch/read-only index 265f2880b..c65055dea 100755 --- a/tests/touch/read-only +++ b/tests/touch/read-only @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch skip_if_root_ : > read-only || framework_failure diff --git a/tests/touch/relative b/tests/touch/relative index 7e56a305a..0c5e36782 100755 --- a/tests/touch/relative +++ b/tests/touch/relative @@ -18,7 +18,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure diff --git a/tests/touch/trailing-slash b/tests/touch/trailing-slash index 97b910018..cc5e7c62e 100755 --- a/tests/touch/trailing-slash +++ b/tests/touch/trailing-slash @@ -17,7 +17,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. . "${srcdir=.}/init.sh"; path_prepend_ ../src -test "$VERBOSE" = yes && touch --version +print_ver_ touch ln -s nowhere dangling || framework_failure ln -s loop loop || framework_failure |