diff options
106 files changed, 5 insertions, 108 deletions
diff --git a/tests/check.mk b/tests/check.mk index 21a827364..bbf22ed93 100644 --- a/tests/check.mk +++ b/tests/check.mk @@ -43,10 +43,12 @@ check: vc_exe_in_TESTS built_programs = \ (cd $(top_builddir)/src && MAKEFLAGS= $(MAKE) -s built_programs.list) -# Note that the first line is a statement. It ensures that environment -# variables that can perturb tests are unset. The rest are envvar settings -# that propagate build-related Makefile variables to test scripts. +# Note that the first lines are statements. They ensures that environment +# variables that can perturb tests are unset or set to expected values. +# The rest are envvar settings that propagate build-related Makefile +# variables to test scripts. TESTS_ENVIRONMENT = \ + . $(top_srcdir)/tests/lang-default; \ . $(top_srcdir)/tests/envvar-check; \ LOCALE_FR='$(LOCALE_FR)' \ abs_top_builddir='$(abs_top_builddir)' \ diff --git a/tests/chgrp/basic b/tests/chgrp/basic index b242a2a88..c21aec04f 100755 --- a/tests/chgrp/basic +++ b/tests/chgrp/basic @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/group-names . $top_srcdir/tests/test-lib.sh diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x index f4df292f5..fbe100265 100755 --- a/tests/chgrp/no-x +++ b/tests/chgrp/no-x @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/group-names . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/chmod/c-option b/tests/chmod/c-option index 838270f01..e756b5be8 100755 --- a/tests/chmod/c-option +++ b/tests/chmod/c-option @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then chmod --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh umask 0 diff --git a/tests/chmod/no-x b/tests/chmod/no-x index 7a7995a00..336041ce2 100755 --- a/tests/chmod/no-x +++ b/tests/chmod/no-x @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then chmod --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/chmod/setgid b/tests/chmod/setgid index c716e4b2a..c156354b8 100755 --- a/tests/chmod/setgid +++ b/tests/chmod/setgid @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then chmod --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh umask 0 diff --git a/tests/chmod/thru-dangling b/tests/chmod/thru-dangling index a2807284b..0924b4779 100755 --- a/tests/chmod/thru-dangling +++ b/tests/chmod/thru-dangling @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then chmod --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh ln -s non-existent dangle || framework_failure diff --git a/tests/chmod/umask-x b/tests/chmod/umask-x index 9f33fbfc7..1bc5033c6 100755 --- a/tests/chmod/umask-x +++ b/tests/chmod/umask-x @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then chmod --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh fail=0 diff --git a/tests/chmod/usage b/tests/chmod/usage index 8a641b87f..9c867c06f 100755 --- a/tests/chmod/usage +++ b/tests/chmod/usage @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then chmod --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh fail=0 diff --git a/tests/chown/basic b/tests/chown/basic index 3ad958a95..fbe74a253 100755 --- a/tests/chown/basic +++ b/tests/chown/basic @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then chgrp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_root_ diff --git a/tests/chown/deref b/tests/chown/deref index be557e1ce..b7688c355 100755 --- a/tests/chown/deref +++ b/tests/chown/deref @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then chown --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh ln -s no-such dangle || framework_failure diff --git a/tests/chown/preserve-root b/tests/chown/preserve-root index cdc7234b5..9ec18f5b2 100755 --- a/tests/chown/preserve-root +++ b/tests/chown/preserve-root @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then chown --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/cp/abuse b/tests/cp/abuse index 737a3ebab..2f6e20f67 100755 --- a/tests/cp/abuse +++ b/tests/cp/abuse @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir a b c || framework_failure diff --git a/tests/cp/acl b/tests/cp/acl index bfea3bfd3..bfbb23803 100755 --- a/tests/cp/acl +++ b/tests/cp/acl @@ -18,7 +18,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # Make sure we get English translations. -. $top_srcdir/tests/lang-default if test "$VERBOSE" = yes; then set -x diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src index e55ede1be..23d2a59d8 100755 --- a/tests/cp/backup-is-src +++ b/tests/cp/backup-is-src @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh echo a > a || framework_failure diff --git a/tests/cp/cp-a-selinux b/tests/cp/cp-a-selinux index dfbded1d2..92627e719 100755 --- a/tests/cp/cp-a-selinux +++ b/tests/cp/cp-a-selinux @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_root_ require_selinux_ diff --git a/tests/cp/cp-i b/tests/cp/cp-i index 5aa690d86..a2c47be44 100755 --- a/tests/cp/cp-i +++ b/tests/cp/cp-i @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir -p a b/a/c || framework_failure diff --git a/tests/cp/cp-mv-backup b/tests/cp/cp-mv-backup index 41bc50b2f..41bf8771c 100755 --- a/tests/cp/cp-mv-backup +++ b/tests/cp/cp-mv-backup @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then fi # Ensure that ls sorts the same way for everyone. -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh diff --git a/tests/cp/deref-slink b/tests/cp/deref-slink index dfd287161..6a24290c9 100755 --- a/tests/cp/deref-slink +++ b/tests/cp/deref-slink @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch f slink-target || framework_failure diff --git a/tests/cp/fail-perm b/tests/cp/fail-perm index b5d14d62f..ae9ca041c 100755 --- a/tests/cp/fail-perm +++ b/tests/cp/fail-perm @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/cp/into-self b/tests/cp/into-self index 7660454a7..49f5feddd 100755 --- a/tests/cp/into-self +++ b/tests/cp/into-self @@ -26,7 +26,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir dir || framework_failure diff --git a/tests/cp/link-preserve b/tests/cp/link-preserve index 091c0a504..b396cd566 100755 --- a/tests/cp/link-preserve +++ b/tests/cp/link-preserve @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch a || framework_failure diff --git a/tests/cp/preserve-gid b/tests/cp/preserve-gid index ce08a60ac..1f18e0375 100755 --- a/tests/cp/preserve-gid +++ b/tests/cp/preserve-gid @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_root_ diff --git a/tests/cp/same-file b/tests/cp/same-file index 1058b568d..b32d2d81f 100755 --- a/tests/cp/same-file +++ b/tests/cp/same-file @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh # Unset CDPATH. Otherwise, output from the `cd dir' command diff --git a/tests/cp/slink-2-slink b/tests/cp/slink-2-slink index 633b27eea..8fd1dac8f 100755 --- a/tests/cp/slink-2-slink +++ b/tests/cp/slink-2-slink @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch file || framework_failure diff --git a/tests/cp/special-f b/tests/cp/special-f index a2e67ba40..82e6ae27b 100755 --- a/tests/cp/special-f +++ b/tests/cp/special-f @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkfifo fifo || diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash index 1ace67bc6..a5854e1b9 100755 --- a/tests/cp/symlink-slash +++ b/tests/cp/symlink-slash @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir dir || framework_failure diff --git a/tests/cp/thru-dangling b/tests/cp/thru-dangling index 1b1145b5a..aa494c597 100755 --- a/tests/cp/thru-dangling +++ b/tests/cp/thru-dangling @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh ln -s no-such dangle || framework_failure diff --git a/tests/du/basic b/tests/du/basic index 6833495e4..3a378cedd 100755 --- a/tests/du/basic +++ b/tests/du/basic @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then du --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir -p a/b d d/sub || framework_failure diff --git a/tests/du/hard-link b/tests/du/hard-link index 94fe9c48c..d0ca8551e 100755 --- a/tests/du/hard-link +++ b/tests/du/hard-link @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then du --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir -p dir/sub diff --git a/tests/du/inacc-dest b/tests/du/inacc-dest index ba5aed0ad..589328d66 100755 --- a/tests/du/inacc-dest +++ b/tests/du/inacc-dest @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then du --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/du/long-sloop b/tests/du/long-sloop index a9692241c..208417e70 100755 --- a/tests/du/long-sloop +++ b/tests/du/long-sloop @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then du --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh # Create lots of directories, each containing a single symlink diff --git a/tests/du/no-x b/tests/du/no-x index 9cff767b0..b7d62730a 100755 --- a/tests/du/no-x +++ b/tests/du/no-x @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then du --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/install/basic-1 b/tests/install/basic-1 index 26ac5ddfb..92c383fc1 100755 --- a/tests/install/basic-1 +++ b/tests/install/basic-1 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then ginstall --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/ln/hard-backup b/tests/ln/hard-backup index d46316ff9..0021d3730 100755 --- a/tests/ln/hard-backup +++ b/tests/ln/hard-backup @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then ln --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch f || framework_failure diff --git a/tests/ln/sf-1 b/tests/ln/sf-1 index 9ac0f9873..224d2cb01 100755 --- a/tests/ln/sf-1 +++ b/tests/ln/sf-1 @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then fi # Make sure we get English translations. -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh echo foo > a || framework_failure diff --git a/tests/ls/file-type b/tests/ls/file-type index 87f63c96f..327c350c9 100755 --- a/tests/ls/file-type +++ b/tests/ls/file-type @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then ls --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir sub diff --git a/tests/ls/infloop b/tests/ls/infloop index d96efa070..bc783ba4d 100755 --- a/tests/ls/infloop +++ b/tests/ls/infloop @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then ls --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir loop || framework_failure diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid index 37becec26..938181061 100755 --- a/tests/ls/nameless-uid +++ b/tests/ls/nameless-uid @@ -24,7 +24,6 @@ fi : ${srcdir=.} . $top_srcdir/tests/require-perl -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_root_ diff --git a/tests/ls/rt-1 b/tests/ls/rt-1 index 3e3c36a0f..c07e5e56a 100755 --- a/tests/ls/rt-1 +++ b/tests/ls/rt-1 @@ -16,7 +16,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -. $top_srcdir/tests/lang-default if test "$VERBOSE" = yes; then set -x diff --git a/tests/ls/stat-failed b/tests/ls/stat-failed index 977de393e..1d1630a64 100755 --- a/tests/ls/stat-failed +++ b/tests/ls/stat-failed @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then ls --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/ls/symlink-slash b/tests/ls/symlink-slash index 641826e13..830cb9670 100755 --- a/tests/ls/symlink-slash +++ b/tests/ls/symlink-slash @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then ls --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir dir || framework_failure diff --git a/tests/ls/x-option b/tests/ls/x-option index 2153536b3..eb1a39e20 100755 --- a/tests/ls/x-option +++ b/tests/ls/x-option @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then ls --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir subdir || framework_failure diff --git a/tests/misc/chcon b/tests/misc/chcon index 74248a3e6..e637893ef 100755 --- a/tests/misc/chcon +++ b/tests/misc/chcon @@ -6,7 +6,6 @@ if test "$VERBOSE" = yes; then chcon --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_root_ require_selinux_ diff --git a/tests/misc/chcon-fail b/tests/misc/chcon-fail index 036d531ee..5c67276ce 100755 --- a/tests/misc/chcon-fail +++ b/tests/misc/chcon-fail @@ -7,7 +7,6 @@ if test "$VERBOSE" = yes; then chcon --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh fail=0 diff --git a/tests/misc/csplit b/tests/misc/csplit index a34fc24a3..3d681fd21 100755 --- a/tests/misc/csplit +++ b/tests/misc/csplit @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then csplit --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh fail=0 diff --git a/tests/misc/df-P b/tests/misc/df-P index 7b52dd2d6..7669550e1 100755 --- a/tests/misc/df-P +++ b/tests/misc/df-P @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then df --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh fail=0 diff --git a/tests/misc/groups-dash b/tests/misc/groups-dash index e7d7d371f..62bf1a4e8 100755 --- a/tests/misc/groups-dash +++ b/tests/misc/groups-dash @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then groups --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh # 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 3d7802b63..12e16c3f0 100755 --- a/tests/misc/groups-version +++ b/tests/misc/groups-version @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then groups --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_built_ groups id diff --git a/tests/misc/nohup b/tests/misc/nohup index 62984062b..dc90f48f1 100755 --- a/tests/misc/nohup +++ b/tests/misc/nohup @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then nohup --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh fail=0 diff --git a/tests/misc/printf-surprise b/tests/misc/printf-surprise index 3cc3646d9..905660262 100755 --- a/tests/misc/printf-surprise +++ b/tests/misc/printf-surprise @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then "$prog" --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_ulimit_ diff --git a/tests/misc/runcon-no-reorder b/tests/misc/runcon-no-reorder index 05e3781af..77637a30a 100755 --- a/tests/misc/runcon-no-reorder +++ b/tests/misc/runcon-no-reorder @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then runcon --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cat <<\EOF > exp || framework_failure diff --git a/tests/misc/selinux b/tests/misc/selinux index 414e22e4d..e94666492 100755 --- a/tests/misc/selinux +++ b/tests/misc/selinux @@ -10,7 +10,6 @@ if test "$VERBOSE" = yes; then stat --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ require_selinux_ diff --git a/tests/misc/split-a b/tests/misc/split-a index 246a1c7b9..cde48559e 100755 --- a/tests/misc/split-a +++ b/tests/misc/split-a @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then split --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh 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 ce7ee295d..d15dd9244 100755 --- a/tests/misc/split-fail +++ b/tests/misc/split-fail @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then split --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch in || framework_failure diff --git a/tests/misc/tac-continue b/tests/misc/tac-continue index 0c421e5b6..c8da320e1 100755 --- a/tests/misc/tac-continue +++ b/tests/misc/tac-continue @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then tac --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh # See if the envvar is defined. diff --git a/tests/misc/wc-files0 b/tests/misc/wc-files0 index 7b54fda6c..d80911dbd 100755 --- a/tests/misc/wc-files0 +++ b/tests/misc/wc-files0 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then wc --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh echo 2 > 2b || framework_failure diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v index ffca679e2..b3759d559 100755 --- a/tests/mkdir/p-v +++ b/tests/mkdir/p-v @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mkdir --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh fail=0 diff --git a/tests/mkdir/selinux b/tests/mkdir/selinux index f0795b1ed..31b1f3e23 100755 --- a/tests/mkdir/selinux +++ b/tests/mkdir/selinux @@ -27,7 +27,6 @@ fi # mcstrans-0.2.8-1.fc9, the following commands may mistakenly exit # successfully, in spite of the invalid context string. -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh c=invalid-selinux-context diff --git a/tests/mv/acl b/tests/mv/acl index 095fef12d..858c2aff9 100755 --- a/tests/mv/acl +++ b/tests/mv/acl @@ -24,7 +24,6 @@ if test "$VERBOSE" = yes; then setfacl --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_acl_ diff --git a/tests/mv/backup-dir b/tests/mv/backup-dir index d23476e34..e3b42fbbb 100755 --- a/tests/mv/backup-dir +++ b/tests/mv/backup-dir @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir A B || framework_failure diff --git a/tests/mv/backup-is-src b/tests/mv/backup-is-src index f90ce43c6..3335d0758 100755 --- a/tests/mv/backup-is-src +++ b/tests/mv/backup-is-src @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/childproof b/tests/mv/childproof index 6cece3f3c..1fa77dc01 100755 --- a/tests/mv/childproof +++ b/tests/mv/childproof @@ -25,7 +25,6 @@ if test "$VERBOSE" = yes; then ln --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/mv/diag b/tests/mv/diag index 37739f071..413da6fa6 100755 --- a/tests/mv/diag +++ b/tests/mv/diag @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then fi # Make sure we get English translations. -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch f1 || framework_failure diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir index f8361fbff..76622dc0a 100755 --- a/tests/mv/dir2dir +++ b/tests/mv/dir2dir @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir -p a/t b/t || framework_failure diff --git a/tests/mv/dup-source b/tests/mv/dup-source index bba2ef869..edb539733 100755 --- a/tests/mv/dup-source +++ b/tests/mv/dup-source @@ -25,7 +25,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/mv/force b/tests/mv/force index 27c0a18b4..05d7f0446 100755 --- a/tests/mv/force +++ b/tests/mv/force @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh ff=mvforce diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1 index 93f8ec194..6afaeade6 100755 --- a/tests/mv/hard-link-1 +++ b/tests/mv/hard-link-1 @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose index f156f79f7..3a2456633 100755 --- a/tests/mv/hard-verbose +++ b/tests/mv/hard-verbose @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch x || framework_failure diff --git a/tests/mv/i-2 b/tests/mv/i-2 index 2b537309c..4153dc98f 100755 --- a/tests/mv/i-2 +++ b/tests/mv/i-2 @@ -25,7 +25,6 @@ fi # Make sure we get English translations. -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/mv/i-3 b/tests/mv/i-3 index 1250baf7d..3052526e9 100755 --- a/tests/mv/i-3 +++ b/tests/mv/i-3 @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/input-tty . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/mv/i-4 b/tests/mv/i-4 index 371452759..e1a2c1cae 100755 --- a/tests/mv/i-4 +++ b/tests/mv/i-4 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh for i in a b; do diff --git a/tests/mv/i-5 b/tests/mv/i-5 index 4143c838e..3b2e27d15 100755 --- a/tests/mv/i-5 +++ b/tests/mv/i-5 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir a || framework_failure diff --git a/tests/mv/i-link-no b/tests/mv/i-link-no index b3f8fd4be..2eddf8513 100755 --- a/tests/mv/i-link-no +++ b/tests/mv/i-link-no @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir a b || framework_failure diff --git a/tests/mv/into-self b/tests/mv/into-self index a877de4f5..e9273d16a 100755 --- a/tests/mv/into-self +++ b/tests/mv/into-self @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh dir=toself-dir diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2 index 147941a22..32801a3a4 100755 --- a/tests/mv/into-self-2 +++ b/tests/mv/into-self-2 @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/into-self-3 b/tests/mv/into-self-3 index f531f5188..3235b7f95 100755 --- a/tests/mv/into-self-3 +++ b/tests/mv/into-self-3 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh dir1=is3-dir1 diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1 index 8bf507577..d883f5b12 100755 --- a/tests/mv/mv-special-1 +++ b/tests/mv/mv-special-1 @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/part-fail b/tests/mv/part-fail index 92d7ad4af..e5396c2c6 100755 --- a/tests/mv/part-fail +++ b/tests/mv/part-fail @@ -24,7 +24,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ cleanup_() { t=$other_partition_tmpdir; chmod -R 700 "$t"; rm -rf "$t"; } diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink index f49ebec02..0b7e21347 100755 --- a/tests/mv/part-symlink +++ b/tests/mv/part-symlink @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then cp --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm index 54aa8363a..ca32e473f 100755 --- a/tests/mv/partition-perm +++ b/tests/mv/partition-perm @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh cleanup_() { rm -rf "$other_partition_tmpdir"; } . "$abs_top_srcdir/tests/other-fs-tmpdir" diff --git a/tests/mv/perm-1 b/tests/mv/perm-1 index a5ab790c0..8a359ff71 100755 --- a/tests/mv/perm-1 +++ b/tests/mv/perm-1 @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/mv/reply-no b/tests/mv/reply-no index 35ec5241c..e3947724f 100755 --- a/tests/mv/reply-no +++ b/tests/mv/reply-no @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch a b || framework_failure diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart index 940770b63..d0e90c1ac 100755 --- a/tests/mv/sticky-to-xpart +++ b/tests/mv/sticky-to-xpart @@ -24,7 +24,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_root_ diff --git a/tests/mv/update b/tests/mv/update index 6fab2ce03..7edb99a75 100755 --- a/tests/mv/update +++ b/tests/mv/update @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then mv --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh echo old > old || framework_failure diff --git a/tests/rm/cycle b/tests/rm/cycle index acaa14e35..5daf716ef 100755 --- a/tests/rm/cycle +++ b/tests/rm/cycle @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/rm/dir-no-w b/tests/rm/dir-no-w index 4f5b32590..94f53e64c 100755 --- a/tests/rm/dir-no-w +++ b/tests/rm/dir-no-w @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir --mode=0500 unwritable-dir || framework_failure diff --git a/tests/rm/dir-nonrecur b/tests/rm/dir-nonrecur index 817edfd58..32cabc626 100755 --- a/tests/rm/dir-nonrecur +++ b/tests/rm/dir-nonrecur @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir d || framework_failure diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm index 90a1ce943..6e98baa63 100755 --- a/tests/rm/fail-2eperm +++ b/tests/rm/fail-2eperm @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_root_ diff --git a/tests/rm/fail-eacces b/tests/rm/fail-eacces index 7e13a789a..d2b5b04e0 100755 --- a/tests/rm/fail-eacces +++ b/tests/rm/fail-eacces @@ -24,7 +24,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible index e00093654..2f86b034b 100755 --- a/tests/rm/inaccessible +++ b/tests/rm/inaccessible @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh # Skip this test if your system has neither the openat-style functions diff --git a/tests/rm/interactive-always b/tests/rm/interactive-always index a20c87955..a6d08f3ba 100755 --- a/tests/rm/interactive-always +++ b/tests/rm/interactive-always @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh touch file1-1 file1-2 file2-1 file2-2 file3-1 file3-2 file4-1 file4-2 \ diff --git a/tests/rm/interactive-once b/tests/rm/interactive-once index bb2f23844..4c925161e 100755 --- a/tests/rm/interactive-once +++ b/tests/rm/interactive-once @@ -23,7 +23,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir -p dir1-1 dir2-1 dir2-2 || framework_failure diff --git a/tests/rm/isatty b/tests/rm/isatty index b0f4fdcb7..382f30a25 100755 --- a/tests/rm/isatty +++ b/tests/rm/isatty @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system index abb12d4bf..eb8482de8 100755 --- a/tests/rm/one-file-system +++ b/tests/rm/one-file-system @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh require_root_ diff --git a/tests/rm/r-1 b/tests/rm/r-1 index 1bc1743a5..97f00c67f 100755 --- a/tests/rm/r-1 +++ b/tests/rm/r-1 @@ -24,7 +24,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir a a/a || framework_failure diff --git a/tests/rm/r-2 b/tests/rm/r-2 index 370260690..f3e1cfa70 100755 --- a/tests/rm/r-2 +++ b/tests/rm/r-2 @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir t t/a t/a/b || framework_failure diff --git a/tests/rm/rm1 b/tests/rm/rm1 index 0ea38eb5d..110a82d9e 100755 --- a/tests/rm/rm1 +++ b/tests/rm/rm1 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/rm/rm2 b/tests/rm/rm2 index fca9fa554..8df52c861 100755 --- a/tests/rm/rm2 +++ b/tests/rm/rm2 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/rm/rm3 b/tests/rm/rm3 index 9708bd295..1682ea3ec 100755 --- a/tests/rm/rm3 +++ b/tests/rm/rm3 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/rm/rm4 b/tests/rm/rm4 index 70bc048a9..0b6ab6988 100755 --- a/tests/rm/rm4 +++ b/tests/rm/rm4 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/rm/rm5 b/tests/rm/rm5 index 73245838d..e9c94ad26 100755 --- a/tests/rm/rm5 +++ b/tests/rm/rm5 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/rm/unread2 b/tests/rm/unread2 index 1e3fad939..7f582d0be 100755 --- a/tests/rm/unread2 +++ b/tests/rm/unread2 @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/rm/v-slash b/tests/rm/v-slash index 198b82b4c..a942f1f5b 100755 --- a/tests/rm/v-slash +++ b/tests/rm/v-slash @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then rm --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh mkdir a || framework_failure diff --git a/tests/touch/fail-diag b/tests/touch/fail-diag index 7177ad444..1df8e5494 100755 --- a/tests/touch/fail-diag +++ b/tests/touch/fail-diag @@ -21,7 +21,6 @@ if test "$VERBOSE" = yes; then touch --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh skip_if_root_ diff --git a/tests/touch/not-owner b/tests/touch/not-owner index d041531c5..f3b294d78 100755 --- a/tests/touch/not-owner +++ b/tests/touch/not-owner @@ -22,7 +22,6 @@ if test "$VERBOSE" = yes; then touch --version fi -. $top_srcdir/tests/lang-default . $top_srcdir/tests/test-lib.sh if env -- test -w /; then |