summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/check.mk6
-rwxr-xr-xtests/chgrp/basic2
-rwxr-xr-xtests/chgrp/default-no-deref2
-rwxr-xr-xtests/chgrp/deref2
-rwxr-xr-xtests/chgrp/no-x2
-rwxr-xr-xtests/chgrp/posix-H2
-rwxr-xr-xtests/chgrp/recurse2
-rwxr-xr-xtests/chmod/c-option2
-rwxr-xr-xtests/chmod/equal-x2
-rwxr-xr-xtests/chmod/equals2
-rwxr-xr-xtests/chmod/inaccessible2
-rwxr-xr-xtests/chmod/no-x2
-rwxr-xr-xtests/chmod/octal2
-rwxr-xr-xtests/chmod/setgid2
-rwxr-xr-xtests/chmod/thru-dangling2
-rwxr-xr-xtests/chmod/umask-x2
-rwxr-xr-xtests/chmod/usage2
-rwxr-xr-xtests/chown/basic2
-rwxr-xr-xtests/chown/deref2
-rwxr-xr-xtests/chown/preserve-root2
-rwxr-xr-xtests/chown/separator2
-rwxr-xr-xtests/cp/abuse2
-rwxr-xr-xtests/cp/acl2
-rwxr-xr-xtests/cp/backup-12
-rwxr-xr-xtests/cp/backup-dir2
-rwxr-xr-xtests/cp/backup-is-src2
-rwxr-xr-xtests/cp/cp-HL2
-rwxr-xr-xtests/cp/cp-a-selinux2
-rwxr-xr-xtests/cp/cp-deref2
-rwxr-xr-xtests/cp/cp-i2
-rwxr-xr-xtests/cp/cp-mv-backup2
-rwxr-xr-xtests/cp/cp-parents2
-rwxr-xr-xtests/cp/deref-slink2
-rwxr-xr-xtests/cp/dir-rm-dest2
-rwxr-xr-xtests/cp/dir-slash2
-rwxr-xr-xtests/cp/dir-vs-file2
-rwxr-xr-xtests/cp/existing-perm-race2
-rwxr-xr-xtests/cp/fail-perm2
-rwxr-xr-xtests/cp/file-perm-race2
-rwxr-xr-xtests/cp/into-self2
-rwxr-xr-xtests/cp/link2
-rwxr-xr-xtests/cp/link-no-deref2
-rwxr-xr-xtests/cp/link-preserve2
-rwxr-xr-xtests/cp/no-deref-link12
-rwxr-xr-xtests/cp/no-deref-link22
-rwxr-xr-xtests/cp/no-deref-link32
-rwxr-xr-xtests/cp/parent-perm2
-rwxr-xr-xtests/cp/parent-perm-race2
-rwxr-xr-xtests/cp/perm2
-rwxr-xr-xtests/cp/preserve-22
-rwxr-xr-xtests/cp/preserve-gid2
-rwxr-xr-xtests/cp/proc-zero-len2
-rwxr-xr-xtests/cp/r-vs-symlink2
-rwxr-xr-xtests/cp/same-file2
-rwxr-xr-xtests/cp/slink-2-slink2
-rwxr-xr-xtests/cp/sparse2
-rwxr-xr-xtests/cp/special-bits2
-rwxr-xr-xtests/cp/special-f2
-rwxr-xr-xtests/cp/src-base-dot2
-rwxr-xr-xtests/cp/symlink-slash2
-rwxr-xr-xtests/cp/thru-dangling2
-rwxr-xr-xtests/dd/misc2
-rwxr-xr-xtests/dd/not-rewound2
-rwxr-xr-xtests/dd/skip-seek22
-rwxr-xr-xtests/dd/unblock-sync2
-rwxr-xr-xtests/du/2g2
-rwxr-xr-xtests/du/8gb2
-rwxr-xr-xtests/du/basic2
-rwxr-xr-xtests/du/deref2
-rwxr-xr-xtests/du/deref-args2
-rwxr-xr-xtests/du/exclude2
-rwxr-xr-xtests/du/fd-leak2
-rwxr-xr-xtests/du/hard-link2
-rwxr-xr-xtests/du/inacc-dest2
-rwxr-xr-xtests/du/inacc-dir2
-rwxr-xr-xtests/du/inaccessible-cwd2
-rwxr-xr-xtests/du/long-from-unreadable2
-rwxr-xr-xtests/du/long-sloop2
-rwxr-xr-xtests/du/no-deref2
-rwxr-xr-xtests/du/no-x2
-rwxr-xr-xtests/du/one-file-system2
-rwxr-xr-xtests/du/restore-wd2
-rwxr-xr-xtests/du/slash2
-rwxr-xr-xtests/du/slink2
-rwxr-xr-xtests/du/trailing-slash2
-rwxr-xr-xtests/du/two-args2
-rwxr-xr-xtests/install/basic-12
-rwxr-xr-xtests/install/create-leading2
-rwxr-xr-xtests/install/d-slashdot2
-rwxr-xr-xtests/install/trap2
-rwxr-xr-xtests/ln/backup-12
-rwxr-xr-xtests/ln/hard-backup2
-rwxr-xr-xtests/ln/misc2
-rwxr-xr-xtests/ln/sf-12
-rwxr-xr-xtests/ln/target-12
-rwxr-xr-xtests/ls/color-dtype-dir2
-rwxr-xr-xtests/ls/dangle2
-rwxr-xr-xtests/ls/dired2
-rwxr-xr-xtests/ls/file-type2
-rwxr-xr-xtests/ls/follow-slink2
-rwxr-xr-xtests/ls/infloop2
-rwxr-xr-xtests/ls/inode2
-rwxr-xr-xtests/ls/m-option2
-rwxr-xr-xtests/ls/nameless-uid4
-rwxr-xr-xtests/ls/no-arg2
-rwxr-xr-xtests/ls/proc-selinux-segfault2
-rwxr-xr-xtests/ls/recursive2
-rwxr-xr-xtests/ls/rt-12
-rwxr-xr-xtests/ls/stat-dtype2
-rwxr-xr-xtests/ls/stat-failed2
-rwxr-xr-xtests/ls/stat-free-symlinks2
-rwxr-xr-xtests/ls/stat-vs-dirent2
-rwxr-xr-xtests/ls/symlink-slash2
-rwxr-xr-xtests/ls/x-option2
-rwxr-xr-xtests/misc/arch2
-rwxr-xr-xtests/misc/cat-proc2
-rwxr-xr-xtests/misc/chcon2
-rwxr-xr-xtests/misc/chcon-fail2
-rwxr-xr-xtests/misc/close-stdout2
-rwxr-xr-xtests/misc/csplit2
-rwxr-xr-xtests/misc/date-sec2
-rwxr-xr-xtests/misc/df2
-rwxr-xr-xtests/misc/df-P2
-rwxr-xr-xtests/misc/false-status2
-rwxr-xr-xtests/misc/fmt-long-line2
-rwxr-xr-xtests/misc/groups-dash2
-rwxr-xr-xtests/misc/groups-version2
-rwxr-xr-xtests/misc/head-c2
-rwxr-xr-xtests/misc/head-pos2
-rwxr-xr-xtests/misc/help-version2
-rwxr-xr-xtests/misc/id-context2
-rwxr-xr-xtests/misc/ls-time2
-rwxr-xr-xtests/misc/mknod2
-rwxr-xr-xtests/misc/nice2
-rwxr-xr-xtests/misc/nl2
-rwxr-xr-xtests/misc/nohup2
-rwxr-xr-xtests/misc/od-N2
-rwxr-xr-xtests/misc/od-x82
-rwxr-xr-xtests/misc/pathchk12
-rwxr-xr-xtests/misc/printf2
-rwxr-xr-xtests/misc/printf-hex2
-rwxr-xr-xtests/misc/printf-surprise2
-rwxr-xr-xtests/misc/ptx-overrun2
-rwxr-xr-xtests/misc/pwd-long4
-rwxr-xr-xtests/misc/pwd-unreadable-parent2
-rwxr-xr-xtests/misc/readlink-fp-loop2
-rwxr-xr-xtests/misc/runcon-no-reorder2
-rwxr-xr-xtests/misc/selinux2
-rwxr-xr-xtests/misc/shred-exact2
-rwxr-xr-xtests/misc/shred-remove2
-rwxr-xr-xtests/misc/shuf2
-rwxr-xr-xtests/misc/sort-compress2
-rwxr-xr-xtests/misc/sort-rand2
-rwxr-xr-xtests/misc/split-a2
-rwxr-xr-xtests/misc/split-fail2
-rwxr-xr-xtests/misc/split-l2
-rwxr-xr-xtests/misc/stat-fmt2
-rwxr-xr-xtests/misc/stty4
-rwxr-xr-xtests/misc/stty-invalid4
-rwxr-xr-xtests/misc/stty-row-col4
-rwxr-xr-xtests/misc/sum-sysv4
-rwxr-xr-xtests/misc/tac-continue2
-rwxr-xr-xtests/misc/tee2
-rwxr-xr-xtests/misc/tee-dash2
-rwxr-xr-xtests/misc/wc-files02
-rwxr-xr-xtests/mkdir/p-12
-rwxr-xr-xtests/mkdir/p-22
-rwxr-xr-xtests/mkdir/p-32
-rwxr-xr-xtests/mkdir/p-slashdot2
-rwxr-xr-xtests/mkdir/p-thru-slink2
-rwxr-xr-xtests/mkdir/p-v2
-rwxr-xr-xtests/mkdir/parents2
-rwxr-xr-xtests/mkdir/perm2
-rwxr-xr-xtests/mkdir/selinux2
-rwxr-xr-xtests/mkdir/special-12
-rwxr-xr-xtests/mkdir/t-slash2
-rwxr-xr-xtests/mkdir/writable-under-readonly2
-rwxr-xr-xtests/mv/acl2
-rwxr-xr-xtests/mv/atomic2
-rwxr-xr-xtests/mv/atomic22
-rwxr-xr-xtests/mv/backup-dir2
-rwxr-xr-xtests/mv/backup-is-src2
-rwxr-xr-xtests/mv/childproof2
-rwxr-xr-xtests/mv/diag2
-rwxr-xr-xtests/mv/dir-file2
-rwxr-xr-xtests/mv/dir2dir2
-rwxr-xr-xtests/mv/dup-source2
-rwxr-xr-xtests/mv/force2
-rwxr-xr-xtests/mv/hard-22
-rwxr-xr-xtests/mv/hard-32
-rwxr-xr-xtests/mv/hard-42
-rwxr-xr-xtests/mv/hard-link-12
-rwxr-xr-xtests/mv/hard-verbose2
-rwxr-xr-xtests/mv/i-22
-rwxr-xr-xtests/mv/i-34
-rwxr-xr-xtests/mv/i-42
-rwxr-xr-xtests/mv/i-52
-rwxr-xr-xtests/mv/i-link-no2
-rwxr-xr-xtests/mv/into-self2
-rwxr-xr-xtests/mv/into-self-22
-rwxr-xr-xtests/mv/into-self-32
-rwxr-xr-xtests/mv/into-self-42
-rwxr-xr-xtests/mv/leak-fd2
-rwxr-xr-xtests/mv/mv-special-12
-rwxr-xr-xtests/mv/no-target-dir2
-rwxr-xr-xtests/mv/part-fail2
-rwxr-xr-xtests/mv/part-hardlink2
-rwxr-xr-xtests/mv/part-rename2
-rwxr-xr-xtests/mv/part-symlink2
-rwxr-xr-xtests/mv/partition-perm2
-rwxr-xr-xtests/mv/perm-12
-rwxr-xr-xtests/mv/reply-no2
-rwxr-xr-xtests/mv/sticky-to-xpart2
-rwxr-xr-xtests/mv/to-symlink2
-rwxr-xr-xtests/mv/trailing-slash2
-rwxr-xr-xtests/mv/update2
-rwxr-xr-xtests/readlink/can-e2
-rwxr-xr-xtests/readlink/can-f2
-rwxr-xr-xtests/readlink/can-m2
-rwxr-xr-xtests/readlink/rl-12
-rwxr-xr-xtests/rm/cycle2
-rwxr-xr-xtests/rm/dangling-symlink2
-rwxr-xr-xtests/rm/deep-12
-rwxr-xr-xtests/rm/deep-22
-rwxr-xr-xtests/rm/dir-no-w2
-rwxr-xr-xtests/rm/dir-nonrecur2
-rwxr-xr-xtests/rm/dot-rel2
-rwxr-xr-xtests/rm/empty-inacc2
-rwxr-xr-xtests/rm/f-12
-rwxr-xr-xtests/rm/fail-2eperm2
-rwxr-xr-xtests/rm/fail-eacces2
-rwxr-xr-xtests/rm/hash2
-rwxr-xr-xtests/rm/i-12
-rwxr-xr-xtests/rm/i-never2
-rwxr-xr-xtests/rm/i-no-r2
-rwxr-xr-xtests/rm/ignorable2
-rwxr-xr-xtests/rm/inaccessible2
-rwxr-xr-xtests/rm/interactive-always2
-rwxr-xr-xtests/rm/interactive-once2
-rwxr-xr-xtests/rm/ir-12
-rwxr-xr-xtests/rm/isatty2
-rwxr-xr-xtests/rm/no-give-up2
-rwxr-xr-xtests/rm/one-file-system2
-rwxr-xr-xtests/rm/r-12
-rwxr-xr-xtests/rm/r-22
-rwxr-xr-xtests/rm/r-32
-rwxr-xr-xtests/rm/r-42
-rwxr-xr-xtests/rm/readdir-bug2
-rwxr-xr-xtests/rm/rm12
-rwxr-xr-xtests/rm/rm22
-rwxr-xr-xtests/rm/rm32
-rwxr-xr-xtests/rm/rm42
-rwxr-xr-xtests/rm/rm52
-rwxr-xr-xtests/rm/sunos-12
-rwxr-xr-xtests/rm/unread22
-rwxr-xr-xtests/rm/unread32
-rwxr-xr-xtests/rm/v-slash2
-rwxr-xr-xtests/rmdir/fail-perm2
-rwxr-xr-xtests/rmdir/ignore2
-rwxr-xr-xtests/rmdir/t-slash2
-rw-r--r--tests/sample-test4
-rwxr-xr-xtests/tail-2/append-only2
-rwxr-xr-xtests/tail-2/assert2
-rwxr-xr-xtests/tail-2/assert-22
-rwxr-xr-xtests/tail-2/big-4gb2
-rwxr-xr-xtests/tail-2/infloop-12
-rwxr-xr-xtests/tail-2/proc-ksyms2
-rwxr-xr-xtests/tail-2/start-middle2
-rwxr-xr-xtests/tail-2/tail-n0f2
-rwxr-xr-xtests/touch/dangling-symlink2
-rwxr-xr-xtests/touch/dir-12
-rwxr-xr-xtests/touch/empty-file2
-rwxr-xr-xtests/touch/fail-diag2
-rwxr-xr-xtests/touch/fifo2
-rwxr-xr-xtests/touch/no-create-missing2
-rwxr-xr-xtests/touch/no-rights2
-rwxr-xr-xtests/touch/not-owner2
-rwxr-xr-xtests/touch/now-owned-by-other2
-rwxr-xr-xtests/touch/obsolescent2
-rwxr-xr-xtests/touch/read-only2
-rwxr-xr-xtests/touch/relative2
282 files changed, 292 insertions, 292 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bddf6e100..1b7dcfa64 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -552,4 +552,4 @@ pr_data = \
pr/ttb3-FF \
pr/w72l24f-ll
-include $(top_srcdir)/tests/check.mk
+include $(srcdir)/check.mk
diff --git a/tests/check.mk b/tests/check.mk
index 5cb8b781e..0e34e98de 100644
--- a/tests/check.mk
+++ b/tests/check.mk
@@ -48,15 +48,15 @@ built_programs = \
# The rest are envvar settings that propagate build-related Makefile
# variables to test scripts.
TESTS_ENVIRONMENT = \
- . $(top_srcdir)/tests/lang-default; \
+ . $(srcdir)/lang-default; \
tmp__=$$TMPDIR; test -d $tmp__ || tmp__=.; \
- . $(top_srcdir)/tests/envvar-check; \
+ . $(srcdir)/envvar-check; \
TMPDIR=$$tmp__; export TMPDIR; \
shell_or_perl_() { \
if grep '^\#!/usr/bin/perl' "$$1" > /dev/null; then \
if $(PERL) -e 'use warnings' > /dev/null 2>&1; then \
grep '^\#!/usr/bin/perl -T' "$$1" > /dev/null && T_=T || T_=; \
- $(PERL) -w$$T_ -I$(top_srcdir)/tests -MCoreutils \
+ $(PERL) -w$$T_ -I$(srcdir) -MCoreutils \
-M"CuTmpdir qw($$tst)" -- "$$1"; \
else \
echo 1>&2 "$$tst: configure did not find a usable version of Perl," \
diff --git a/tests/chgrp/basic b/tests/chgrp/basic
index 889a62c9a..03b8f21e4 100755
--- a/tests/chgrp/basic
+++ b/tests/chgrp/basic
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chgrp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_membership_in_two_groups_
fail=0
diff --git a/tests/chgrp/default-no-deref b/tests/chgrp/default-no-deref
index ff484ed00..f7ffc94b8 100755
--- a/tests/chgrp/default-no-deref
+++ b/tests/chgrp/default-no-deref
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chgrp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_membership_in_two_groups_
set _ $groups; shift
diff --git a/tests/chgrp/deref b/tests/chgrp/deref
index ce70b9d2f..e63a14228 100755
--- a/tests/chgrp/deref
+++ b/tests/chgrp/deref
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chgrp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_membership_in_two_groups_
set _ $groups; shift
diff --git a/tests/chgrp/no-x b/tests/chgrp/no-x
index 93dd520c3..4cf168560 100755
--- a/tests/chgrp/no-x
+++ b/tests/chgrp/no-x
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
chgrp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_membership_in_two_groups_
skip_if_root_
diff --git a/tests/chgrp/posix-H b/tests/chgrp/posix-H
index 0b18b44ce..b376e4ac5 100755
--- a/tests/chgrp/posix-H
+++ b/tests/chgrp/posix-H
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chgrp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_membership_in_two_groups_
set _ $groups; shift
diff --git a/tests/chgrp/recurse b/tests/chgrp/recurse
index 52b0e1973..e4f90a6b7 100755
--- a/tests/chgrp/recurse
+++ b/tests/chgrp/recurse
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chgrp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_membership_in_two_groups_
set _ $groups; shift
diff --git a/tests/chmod/c-option b/tests/chmod/c-option
index 461b6faa2..42da4b209 100755
--- a/tests/chmod/c-option
+++ b/tests/chmod/c-option
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chmod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
umask 0
file=f
diff --git a/tests/chmod/equal-x b/tests/chmod/equal-x
index 6400d029a..06c53c669 100755
--- a/tests/chmod/equal-x
+++ b/tests/chmod/equal-x
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chmod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
file=f
touch $file || framework_failure
diff --git a/tests/chmod/equals b/tests/chmod/equals
index 7ad2793e1..9aca394c4 100755
--- a/tests/chmod/equals
+++ b/tests/chmod/equals
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
chmod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch f || framework_failure
diff --git a/tests/chmod/inaccessible b/tests/chmod/inaccessible
index 6e8744dbb..70cdc9bff 100755
--- a/tests/chmod/inaccessible
+++ b/tests/chmod/inaccessible
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chmod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 336041ce2..b65295bd8 100755
--- a/tests/chmod/no-x
+++ b/tests/chmod/no-x
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
chmod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir -p d/no-x/y a/b || framework_failure
diff --git a/tests/chmod/octal b/tests/chmod/octal
index 32c55120c..a7ddb4503 100755
--- a/tests/chmod/octal
+++ b/tests/chmod/octal
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chmod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/chmod/setgid b/tests/chmod/setgid
index c156354b8..30e92f05a 100755
--- a/tests/chmod/setgid
+++ b/tests/chmod/setgid
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
chmod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
umask 0
mkdir d || framework_failure
diff --git a/tests/chmod/thru-dangling b/tests/chmod/thru-dangling
index 0924b4779..055f9c59c 100755
--- a/tests/chmod/thru-dangling
+++ b/tests/chmod/thru-dangling
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chmod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
ln -s non-existent dangle || framework_failure
diff --git a/tests/chmod/umask-x b/tests/chmod/umask-x
index 1bc5033c6..13b6e9ac2 100755
--- a/tests/chmod/umask-x
+++ b/tests/chmod/umask-x
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chmod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
touch file
diff --git a/tests/chmod/usage b/tests/chmod/usage
index 9c867c06f..ba0ea7313 100755
--- a/tests/chmod/usage
+++ b/tests/chmod/usage
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chmod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/chown/basic b/tests/chown/basic
index fbe74a253..434a6bac2 100755
--- a/tests/chown/basic
+++ b/tests/chown/basic
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chgrp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
touch f || framework_failure
diff --git a/tests/chown/deref b/tests/chown/deref
index b7688c355..4a46827c2 100755
--- a/tests/chown/deref
+++ b/tests/chown/deref
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
chown --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
ln -s no-such dangle || framework_failure
diff --git a/tests/chown/preserve-root b/tests/chown/preserve-root
index 9ec18f5b2..8e2923bf0 100755
--- a/tests/chown/preserve-root
+++ b/tests/chown/preserve-root
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chown --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir d && ln -s / d/slink-to-root
diff --git a/tests/chown/separator b/tests/chown/separator
index b409b0295..eaf27b6c7 100755
--- a/tests/chown/separator
+++ b/tests/chown/separator
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
chown --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
id_u=`id -u` || framework_failure
test -n "$id_u" || framework_failure
diff --git a/tests/cp/abuse b/tests/cp/abuse
index 2f6e20f67..d0faba4dd 100755
--- a/tests/cp/abuse
+++ b/tests/cp/abuse
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir a b c || framework_failure
ln -s ../t a/1 || framework_failure
diff --git a/tests/cp/acl b/tests/cp/acl
index bfbb23803..21a7742ef 100755
--- a/tests/cp/acl
+++ b/tests/cp/acl
@@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then
setfacl --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_acl_
# Skip this test if cp was built without ACL support:
diff --git a/tests/cp/backup-1 b/tests/cp/backup-1
index 6f2ca2eae..7fc165870 100755
--- a/tests/cp/backup-1
+++ b/tests/cp/backup-1
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
suffix=.b
file=b1.$$
diff --git a/tests/cp/backup-dir b/tests/cp/backup-dir
index d2ac2be39..88de81adf 100755
--- a/tests/cp/backup-dir
+++ b/tests/cp/backup-dir
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir x y || framework_failure
diff --git a/tests/cp/backup-is-src b/tests/cp/backup-is-src
index 23d2a59d8..3703350ad 100755
--- a/tests/cp/backup-is-src
+++ b/tests/cp/backup-is-src
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
echo a > a || framework_failure
echo a-tilde > a~ || framework_failure
diff --git a/tests/cp/cp-HL b/tests/cp/cp-HL
index dbfaed1ef..bdc34d9a5 100755
--- a/tests/cp/cp-HL
+++ b/tests/cp/cp-HL
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 92627e719..feb66f9ac 100755
--- a/tests/cp/cp-a-selinux
+++ b/tests/cp/cp-a-selinux
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
require_selinux_
diff --git a/tests/cp/cp-deref b/tests/cp/cp-deref
index 181ba4722..89584502c 100755
--- a/tests/cp/cp-deref
+++ b/tests/cp/cp-deref
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 a2c47be44..a248eaa9e 100755
--- a/tests/cp/cp-i
+++ b/tests/cp/cp-i
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 41bf8771c..4280e481a 100755
--- a/tests/cp/cp-mv-backup
+++ b/tests/cp/cp-mv-backup
@@ -23,7 +23,7 @@ fi
# Ensure that ls sorts the same way for everyone.
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
umask 022
diff --git a/tests/cp/cp-parents b/tests/cp/cp-parents
index 3394265bb..e936f59be 100755
--- a/tests/cp/cp-parents
+++ b/tests/cp/cp-parents
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
working_umask_or_skip_
diff --git a/tests/cp/deref-slink b/tests/cp/deref-slink
index 6a24290c9..d2e953752 100755
--- a/tests/cp/deref-slink
+++ b/tests/cp/deref-slink
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 e9934c339..c97e709f2 100755
--- a/tests/cp/dir-rm-dest
+++ b/tests/cp/dir-rm-dest
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir d e || framework_failure
diff --git a/tests/cp/dir-slash b/tests/cp/dir-slash
index 3521a1a70..0e591cedb 100755
--- a/tests/cp/dir-slash
+++ b/tests/cp/dir-slash
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 cb23172cb..317c69a9c 100755
--- a/tests/cp/dir-vs-file
+++ b/tests/cp/dir-vs-file
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir dir || framework_failure
touch file || framework_failure
diff --git a/tests/cp/existing-perm-race b/tests/cp/existing-perm-race
index f2a328723..d428e99bf 100755
--- a/tests/cp/existing-perm-race
+++ b/tests/cp/existing-perm-race
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_membership_in_two_groups_
set _ $groups; shift
diff --git a/tests/cp/fail-perm b/tests/cp/fail-perm
index ae9ca041c..f2dabd155 100755
--- a/tests/cp/fail-perm
+++ b/tests/cp/fail-perm
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
chmod g-s . || framework_failure
diff --git a/tests/cp/file-perm-race b/tests/cp/file-perm-race
index 09d38a734..1b6eff6bf 100755
--- a/tests/cp/file-perm-race
+++ b/tests/cp/file-perm-race
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
umask 022
mkfifo fifo ||
diff --git a/tests/cp/into-self b/tests/cp/into-self
index 49f5feddd..53dfe5697 100755
--- a/tests/cp/into-self
+++ b/tests/cp/into-self
@@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir dir || framework_failure
diff --git a/tests/cp/link b/tests/cp/link
index 49cedebc4..a1cf92622 100755
--- a/tests/cp/link
+++ b/tests/cp/link
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch src || framework_failure
touch dest || framework_failure
diff --git a/tests/cp/link-no-deref b/tests/cp/link-no-deref
index d249b03d8..3ff16e036 100755
--- a/tests/cp/link-no-deref
+++ b/tests/cp/link-no-deref
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
ln -s no-such-file dangling-slink || framework_failure
diff --git a/tests/cp/link-preserve b/tests/cp/link-preserve
index b396cd566..0dd96f05e 100755
--- a/tests/cp/link-preserve
+++ b/tests/cp/link-preserve
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch a || framework_failure
ln a b || framework_failure
diff --git a/tests/cp/no-deref-link1 b/tests/cp/no-deref-link1
index 018a029fd..e92c40cc3 100755
--- a/tests/cp/no-deref-link1
+++ b/tests/cp/no-deref-link1
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir a b
msg=bar
diff --git a/tests/cp/no-deref-link2 b/tests/cp/no-deref-link2
index 0046dce4a..20b87fc98 100755
--- a/tests/cp/no-deref-link2
+++ b/tests/cp/no-deref-link2
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir b
msg=bar
diff --git a/tests/cp/no-deref-link3 b/tests/cp/no-deref-link3
index 5d0ba7538..32966ca0e 100755
--- a/tests/cp/no-deref-link3
+++ b/tests/cp/no-deref-link3
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
msg=bar
echo $msg > a
diff --git a/tests/cp/parent-perm b/tests/cp/parent-perm
index 77bcf7584..a7da5e2e0 100755
--- a/tests/cp/parent-perm
+++ b/tests/cp/parent-perm
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
working_umask_or_skip_
diff --git a/tests/cp/parent-perm-race b/tests/cp/parent-perm-race
index de542e00d..c84f2e9f3 100755
--- a/tests/cp/parent-perm-race
+++ b/tests/cp/parent-perm-race
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
umask 002
mkdir mode ownership d || framework_failure
diff --git a/tests/cp/perm b/tests/cp/perm
index b482c173d..aed3a722b 100755
--- a/tests/cp/perm
+++ b/tests/cp/perm
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
very_expensive_
umask 037
diff --git a/tests/cp/preserve-2 b/tests/cp/preserve-2
index 0bbe3390c..667b50392 100755
--- a/tests/cp/preserve-2
+++ b/tests/cp/preserve-2
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch f || framework_failure
diff --git a/tests/cp/preserve-gid b/tests/cp/preserve-gid
index 1f18e0375..a999322d2 100755
--- a/tests/cp/preserve-gid
+++ b/tests/cp/preserve-gid
@@ -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/>.
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
create() {
diff --git a/tests/cp/proc-zero-len b/tests/cp/proc-zero-len
index aef5e5a62..33e5802a5 100755
--- a/tests/cp/proc-zero-len
+++ b/tests/cp/proc-zero-len
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch empty || framework_failure
diff --git a/tests/cp/r-vs-symlink b/tests/cp/r-vs-symlink
index 6ee237037..08070f7d9 100755
--- a/tests/cp/r-vs-symlink
+++ b/tests/cp/r-vs-symlink
@@ -25,7 +25,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
echo abc > foo || framework_failure
ln -s foo slink || framework_failure
diff --git a/tests/cp/same-file b/tests/cp/same-file
index b32d2d81f..e5cc8237e 100755
--- a/tests/cp/same-file
+++ b/tests/cp/same-file
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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 8fd1dac8f..c86a251dd 100755
--- a/tests/cp/slink-2-slink
+++ b/tests/cp/slink-2-slink
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch file || framework_failure
ln -s file a || framework_failure
diff --git a/tests/cp/sparse b/tests/cp/sparse
index 0d915df57..2c2024ce3 100755
--- a/tests/cp/sparse
+++ b/tests/cp/sparse
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_sparse_support_
# Create a sparse file.
diff --git a/tests/cp/special-bits b/tests/cp/special-bits
index e0f8bbb0d..c75fb5014 100755
--- a/tests/cp/special-bits
+++ b/tests/cp/special-bits
@@ -25,7 +25,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
touch a b c || framework_failure
diff --git a/tests/cp/special-f b/tests/cp/special-f
index 82e6ae27b..054ad70b4 100755
--- a/tests/cp/special-f
+++ b/tests/cp/special-f
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkfifo fifo ||
skip_test_ "fifos not supported"
diff --git a/tests/cp/src-base-dot b/tests/cp/src-base-dot
index a20268be0..09aedb21f 100755
--- a/tests/cp/src-base-dot
+++ b/tests/cp/src-base-dot
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir x y || framework_failure
diff --git a/tests/cp/symlink-slash b/tests/cp/symlink-slash
index a5854e1b9..893a413e7 100755
--- a/tests/cp/symlink-slash
+++ b/tests/cp/symlink-slash
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir dir || framework_failure
ln -s dir symlink || framework_failure
diff --git a/tests/cp/thru-dangling b/tests/cp/thru-dangling
index aa494c597..71b41cd5d 100755
--- a/tests/cp/thru-dangling
+++ b/tests/cp/thru-dangling
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
ln -s no-such dangle || framework_failure
echo hi > f || framework_failure
diff --git a/tests/dd/misc b/tests/dd/misc
index e734ba240..d54fbfaee 100755
--- a/tests/dd/misc
+++ b/tests/dd/misc
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
dd --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
tmp_in=dd-in.$$
tmp_in2=dd-in2.$$
diff --git a/tests/dd/not-rewound b/tests/dd/not-rewound
index 76eb8a393..b0bdf120e 100755
--- a/tests/dd/not-rewound
+++ b/tests/dd/not-rewound
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
dd --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/dd/skip-seek2 b/tests/dd/skip-seek2
index 0840ad24a..1381305f9 100755
--- a/tests/dd/skip-seek2
+++ b/tests/dd/skip-seek2
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
dd --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/dd/unblock-sync b/tests/dd/unblock-sync
index 484da885d..b66653340 100755
--- a/tests/dd/unblock-sync
+++ b/tests/dd/unblock-sync
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
dd --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
printf 000100020003xx > in || framework_failure
diff --git a/tests/du/2g b/tests/du/2g
index 8479524c0..6a7463c02 100755
--- a/tests/du/2g
+++ b/tests/du/2g
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# Creating a 2GB file counts as `very expensive'.
very_expensive_
diff --git a/tests/du/8gb b/tests/du/8gb
index 66f02e78b..49989d1f2 100755
--- a/tests/du/8gb
+++ b/tests/du/8gb
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 3a378cedd..837ec92d5 100755
--- a/tests/du/basic
+++ b/tests/du/basic
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir -p a/b d d/sub || framework_failure
diff --git a/tests/du/deref b/tests/du/deref
index 47f444921..facdf426b 100755
--- a/tests/du/deref
+++ b/tests/du/deref
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 c0281d5a5..02bdf7d55 100755
--- a/tests/du/deref-args
+++ b/tests/du/deref-args
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir -p dir/a || framework_failure
ln -s dir slink || framework_failure
diff --git a/tests/du/exclude b/tests/du/exclude
index 73a0c5bde..1e32b60f3 100755
--- a/tests/du/exclude
+++ b/tests/du/exclude
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 73fe4f8e7..14df938d3 100755
--- a/tests/du/fd-leak
+++ b/tests/du/fd-leak
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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 d0ca8551e..f4fdf2616 100755
--- a/tests/du/hard-link
+++ b/tests/du/hard-link
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir -p dir/sub
( cd dir && { echo non-empty > f1; ln f1 f2; echo non-empty > sub/F; } )
diff --git a/tests/du/inacc-dest b/tests/du/inacc-dest
index 589328d66..b0ea4d677 100755
--- a/tests/du/inacc-dest
+++ b/tests/du/inacc-dest
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 919406a07..3b5fa5088 100755
--- a/tests/du/inacc-dir
+++ b/tests/du/inacc-dir
@@ -20,7 +20,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir -p a/sub || framework_failure
diff --git a/tests/du/inaccessible-cwd b/tests/du/inaccessible-cwd
index f6af78600..70e83a1f9 100755
--- a/tests/du/inaccessible-cwd
+++ b/tests/du/inaccessible-cwd
@@ -25,7 +25,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
cwd=`pwd`
diff --git a/tests/du/long-from-unreadable b/tests/du/long-from-unreadable
index 1e20bb324..fdaf91ab4 100755
--- a/tests/du/long-from-unreadable
+++ b/tests/du/long-from-unreadable
@@ -33,7 +33,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
proc_file=/proc/self/fd
if test ! -d $proc_file; then
diff --git a/tests/du/long-sloop b/tests/du/long-sloop
index 208417e70..31aac1fe5 100755
--- a/tests/du/long-sloop
+++ b/tests/du/long-sloop
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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 e1b714036..8d8bc6c68 100755
--- a/tests/du/no-deref
+++ b/tests/du/no-deref
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 b7d62730a..5569b5d19 100755
--- a/tests/du/no-x
+++ b/tests/du/no-x
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 fd2695631..82081c6da 100755
--- a/tests/du/one-file-system
+++ b/tests/du/one-file-system
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir -p b/c y/z || framework_failure
diff --git a/tests/du/restore-wd b/tests/du/restore-wd
index 62409db57..b716b4112 100755
--- a/tests/du/restore-wd
+++ b/tests/du/restore-wd
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir a b || framework_failure
diff --git a/tests/du/slash b/tests/du/slash
index a939b91b6..d433a9235 100755
--- a/tests/du/slash
+++ b/tests/du/slash
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_readable_root_
fail=0
diff --git a/tests/du/slink b/tests/du/slink
index 082efddf7..588c4df32 100755
--- a/tests/du/slink
+++ b/tests/du/slink
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# Determine if `.' is on a local (would non-NFS be sufficient?) file system.
# On at least some NFS implementations, symlinks never take up space,
diff --git a/tests/du/trailing-slash b/tests/du/trailing-slash
index a3f853682..92de5d45c 100755
--- a/tests/du/trailing-slash
+++ b/tests/du/trailing-slash
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 5cb875ff0..2b25bf535 100755
--- a/tests/du/two-args
+++ b/tests/du/two-args
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
du --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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/install/basic-1 b/tests/install/basic-1
index 92c383fc1..31f321545 100755
--- a/tests/install/basic-1
+++ b/tests/install/basic-1
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ginstall --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
dir=dir
diff --git a/tests/install/create-leading b/tests/install/create-leading
index 699993863..3e6079245 100755
--- a/tests/install/create-leading
+++ b/tests/install/create-leading
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
ginstall --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/install/d-slashdot b/tests/install/d-slashdot
index e7bf8ea77..057c7bef2 100755
--- a/tests/install/d-slashdot
+++ b/tests/install/d-slashdot
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
install --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/install/trap b/tests/install/trap
index 915ad9ea2..5b2b115e1 100755
--- a/tests/install/trap
+++ b/tests/install/trap
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
ginstall --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/ln/backup-1 b/tests/ln/backup-1
index b1d1bb105..f796f3abf 100755
--- a/tests/ln/backup-1
+++ b/tests/ln/backup-1
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
ln --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch a b || framework_failure
diff --git a/tests/ln/hard-backup b/tests/ln/hard-backup
index 0021d3730..90f8cd85b 100755
--- a/tests/ln/hard-backup
+++ b/tests/ln/hard-backup
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ln --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch f || framework_failure
diff --git a/tests/ln/misc b/tests/ln/misc
index 1f3c1d16e..f8ec46fca 100755
--- a/tests/ln/misc
+++ b/tests/ln/misc
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ln --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
t=tln-symlink
d=tln-subdir
diff --git a/tests/ln/sf-1 b/tests/ln/sf-1
index 224d2cb01..2dd3d8c2e 100755
--- a/tests/ln/sf-1
+++ b/tests/ln/sf-1
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
fi
# Make sure we get English translations.
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
echo foo > a || framework_failure
ln -s . b || framework_failure
diff --git a/tests/ln/target-1 b/tests/ln/target-1
index 6a49b2f4d..e60106c7f 100755
--- a/tests/ln/target-1
+++ b/tests/ln/target-1
@@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then
ln --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir d || framework_failure
fail=0
diff --git a/tests/ls/color-dtype-dir b/tests/ls/color-dtype-dir
index 8a431c466..37b40c459 100755
--- a/tests/ls/color-dtype-dir
+++ b/tests/ls/color-dtype-dir
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# Don't let a different umask perturb the results.
umask 22
diff --git a/tests/ls/dangle b/tests/ls/dangle
index 7266fac89..942b45a8b 100755
--- a/tests/ls/dangle
+++ b/tests/ls/dangle
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 6a1bbd28a..3d96852c0 100755
--- a/tests/ls/dired
+++ b/tests/ls/dired
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir dir || framework_failure
diff --git a/tests/ls/file-type b/tests/ls/file-type
index 327c350c9..1dfc303f4 100755
--- a/tests/ls/file-type
+++ b/tests/ls/file-type
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir sub
cd sub
diff --git a/tests/ls/follow-slink b/tests/ls/follow-slink
index a4374bf96..e0468de23 100755
--- a/tests/ls/follow-slink
+++ b/tests/ls/follow-slink
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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 bc783ba4d..6476e25c3 100755
--- a/tests/ls/infloop
+++ b/tests/ls/infloop
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir loop || framework_failure
ln -s ../loop loop/sub || framework_failure
diff --git a/tests/ls/inode b/tests/ls/inode
index 636c064a3..dea2b2849 100755
--- a/tests/ls/inode
+++ b/tests/ls/inode
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch f || framework_failure
ln -s f slink || framework_failure
diff --git a/tests/ls/m-option b/tests/ls/m-option
index 975042280..15495879e 100755
--- a/tests/ls/m-option
+++ b/tests/ls/m-option
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
seq 2000 > b || framework_failure
touch a || framework_failure
diff --git a/tests/ls/nameless-uid b/tests/ls/nameless-uid
index 938181061..d5fa7f129 100755
--- a/tests/ls/nameless-uid
+++ b/tests/ls/nameless-uid
@@ -22,9 +22,9 @@ if test "$VERBOSE" = yes; then
fi
: ${srcdir=.}
-. $top_srcdir/tests/require-perl
+. $srcdir/require-perl
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
nameless_uid=`$PERL -e 'foreach my $i (1000..16*1024) { getpwuid $i or (print "$i\n"), exit }'`
diff --git a/tests/ls/no-arg b/tests/ls/no-arg
index ea0730e45..cd9dd380c 100755
--- a/tests/ls/no-arg
+++ b/tests/ls/no-arg
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir -p dir/subdir || framework_failure
touch dir/subdir/file2 || framework_failure
diff --git a/tests/ls/proc-selinux-segfault b/tests/ls/proc-selinux-segfault
index 79ea5235d..1a31ece30 100755
--- a/tests/ls/proc-selinux-segfault
+++ b/tests/ls/proc-selinux-segfault
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
f=/proc/sys
test -r $f || f=.
diff --git a/tests/ls/recursive b/tests/ls/recursive
index d8b159c2e..158b9ced3 100755
--- a/tests/ls/recursive
+++ b/tests/ls/recursive
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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/rt-1 b/tests/ls/rt-1
index c07e5e56a..1a131761c 100755
--- a/tests/ls/rt-1
+++ b/tests/ls/rt-1
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
date=1998-01-15
diff --git a/tests/ls/stat-dtype b/tests/ls/stat-dtype
index a6d528983..7e7dcb9c7 100755
--- a/tests/ls/stat-dtype
+++ b/tests/ls/stat-dtype
@@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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 1d1630a64..be9a78094 100755
--- a/tests/ls/stat-failed
+++ b/tests/ls/stat-failed
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir d || framework_failure
diff --git a/tests/ls/stat-free-symlinks b/tests/ls/stat-free-symlinks
index 4dc01b5ed..be4d49048 100755
--- a/tests/ls/stat-free-symlinks
+++ b/tests/ls/stat-free-symlinks
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_strace_ stat
touch x || framework_failure
diff --git a/tests/ls/stat-vs-dirent b/tests/ls/stat-vs-dirent
index f69ffba2d..f105e2f3b 100755
--- a/tests/ls/stat-vs-dirent
+++ b/tests/ls/stat-vs-dirent
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/ls/symlink-slash b/tests/ls/symlink-slash
index 830cb9670..4315b063b 100755
--- a/tests/ls/symlink-slash
+++ b/tests/ls/symlink-slash
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir dir || framework_failure
ln -s dir symlink || framework_failure
diff --git a/tests/ls/x-option b/tests/ls/x-option
index eb1a39e20..b47960007 100755
--- a/tests/ls/x-option
+++ b/tests/ls/x-option
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir subdir || framework_failure
touch subdir/b || framework_failure
diff --git a/tests/misc/arch b/tests/misc/arch
index 3a510b6de..1661d6c60 100755
--- a/tests/misc/arch
+++ b/tests/misc/arch
@@ -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/>.
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# skip this test if arch isn't being built.
case " $built_programs " in
diff --git a/tests/misc/cat-proc b/tests/misc/cat-proc
index 0d7b07ed5..8fa3f56ac 100755
--- a/tests/misc/cat-proc
+++ b/tests/misc/cat-proc
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
cat --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
f=/proc/cpuinfo
diff --git a/tests/misc/chcon b/tests/misc/chcon
index d7a9c5f31..f8caadae2 100755
--- a/tests/misc/chcon
+++ b/tests/misc/chcon
@@ -6,7 +6,7 @@ if test "$VERBOSE" = yes; then
chcon --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
require_selinux_
skip_if_mcstransd_is_running_
diff --git a/tests/misc/chcon-fail b/tests/misc/chcon-fail
index 5c67276ce..d9bac7c85 100755
--- a/tests/misc/chcon-fail
+++ b/tests/misc/chcon-fail
@@ -7,7 +7,7 @@ if test "$VERBOSE" = yes; then
chcon --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/close-stdout b/tests/misc/close-stdout
index c3f54da7d..ede75205f 100755
--- a/tests/misc/close-stdout
+++ b/tests/misc/close-stdout
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
p="$abs_top_builddir"
diff --git a/tests/misc/csplit b/tests/misc/csplit
index 3d681fd21..9997860e1 100755
--- a/tests/misc/csplit
+++ b/tests/misc/csplit
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
csplit --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/date-sec b/tests/misc/date-sec
index 6d7a8bccb..dea183513 100755
--- a/tests/misc/date-sec
+++ b/tests/misc/date-sec
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
date --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/df b/tests/misc/df
index fe8dabb4a..bb895e7fa 100755
--- a/tests/misc/df
+++ b/tests/misc/df
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
df --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
case `df .` in
*'
diff --git a/tests/misc/df-P b/tests/misc/df-P
index 7669550e1..8024864ce 100755
--- a/tests/misc/df-P
+++ b/tests/misc/df-P
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
df --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/false-status b/tests/misc/false-status
index 7eaec30ce..67191a3fe 100755
--- a/tests/misc/false-status
+++ b/tests/misc/false-status
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
false --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
false --version > /dev/null && fail=1
diff --git a/tests/misc/fmt-long-line b/tests/misc/fmt-long-line
index 05e03467e..690202338 100755
--- a/tests/misc/fmt-long-line
+++ b/tests/misc/fmt-long-line
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
fmt --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
printf '%2030s\n' ' '|sed 's/../ y/g' > in || framework_failure
diff --git a/tests/misc/groups-dash b/tests/misc/groups-dash
index 62bf1a4e8..bc132d804 100755
--- a/tests/misc/groups-dash
+++ b/tests/misc/groups-dash
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
groups --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# Coreutils 6.9 and earlier failed to display information on first argument
# if later argument was --.
diff --git a/tests/misc/groups-version b/tests/misc/groups-version
index 12e16c3f0..34dbd3307 100755
--- a/tests/misc/groups-version
+++ b/tests/misc/groups-version
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
groups --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_built_ groups id
fail=0
diff --git a/tests/misc/head-c b/tests/misc/head-c
index 7610533b7..2b348d2e3 100755
--- a/tests/misc/head-c
+++ b/tests/misc/head-c
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
head --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
echo abc > in || framework_failure
diff --git a/tests/misc/head-pos b/tests/misc/head-pos
index 90efe2279..0c55a879b 100755
--- a/tests/misc/head-pos
+++ b/tests/misc/head-pos
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
head --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
(echo a; echo b) > in || framework_failure
diff --git a/tests/misc/help-version b/tests/misc/help-version
index 77e54c7b4..1dcf96f92 100755
--- a/tests/misc/help-version
+++ b/tests/misc/help-version
@@ -25,7 +25,7 @@ test "$VERBOSE" = yes && set -x
test "x$SHELL" = x && SHELL=/bin/sh
export SHELL
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
expected_failure_status_nohup=127
expected_failure_status_printenv=2
diff --git a/tests/misc/id-context b/tests/misc/id-context
index 5dca74493..ea90ec676 100755
--- a/tests/misc/id-context
+++ b/tests/misc/id-context
@@ -20,7 +20,7 @@ if test "$VERBOSE" = yes; then
id --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# Require selinux - when selinux is disabled, id never prints scontext.
require_selinux_
diff --git a/tests/misc/ls-time b/tests/misc/ls-time
index 69f597938..07271c601 100755
--- a/tests/misc/ls-time
+++ b/tests/misc/ls-time
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ls --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# Avoid any possible glitches due to daylight-saving changes near the
# time stamps used during the test.
diff --git a/tests/misc/mknod b/tests/misc/mknod
index bcaf98bf3..bb8e02480 100755
--- a/tests/misc/mknod
+++ b/tests/misc/mknod
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mknod --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/nice b/tests/misc/nice
index f4d40121a..4fcb80fad 100755
--- a/tests/misc/nice
+++ b/tests/misc/nice
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
nice --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
tests='
0 empty 10
diff --git a/tests/misc/nl b/tests/misc/nl
index 58baef9c3..572e44a33 100755
--- a/tests/misc/nl
+++ b/tests/misc/nl
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
nl --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/nohup b/tests/misc/nohup
index dc90f48f1..1b36dbd29 100755
--- a/tests/misc/nohup
+++ b/tests/misc/nohup
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
nohup --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/od-N b/tests/misc/od-N
index 0213dc4ee..884127ceb 100755
--- a/tests/misc/od-N
+++ b/tests/misc/od-N
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
od --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
echo abcdefg > in || framework_failure
diff --git a/tests/misc/od-x8 b/tests/misc/od-x8
index 267ab4d87..b52c1ce38 100755
--- a/tests/misc/od-x8
+++ b/tests/misc/od-x8
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
od --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 3bc5869fd..5b20f077a 100755
--- a/tests/misc/pathchk1
+++ b/tests/misc/pathchk1
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
pathchk --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
touch file || framework_failure
diff --git a/tests/misc/printf b/tests/misc/printf
index bdcfb5d2f..78084b3b0 100755
--- a/tests/misc/printf
+++ b/tests/misc/printf
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
"$prog" --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/printf-hex b/tests/misc/printf-hex
index e5db45e4d..968f66726 100755
--- a/tests/misc/printf-hex
+++ b/tests/misc/printf-hex
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
"$prog" --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/printf-surprise b/tests/misc/printf-surprise
index 90a29973f..dd3c332bb 100755
--- a/tests/misc/printf-surprise
+++ b/tests/misc/printf-surprise
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
env $prog --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_ulimit_
fail=0
diff --git a/tests/misc/ptx-overrun b/tests/misc/ptx-overrun
index 552d7e2c4..185969118 100755
--- a/tests/misc/ptx-overrun
+++ b/tests/misc/ptx-overrun
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ptx --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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/pwd-long b/tests/misc/pwd-long
index a8aff7016..94d4e4c03 100755
--- a/tests/misc/pwd-long
+++ b/tests/misc/pwd-long
@@ -18,9 +18,9 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
: ${srcdir=.}
-. $top_srcdir/tests/require-perl
+. $srcdir/require-perl
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_readable_root_
ARGV_0=$0
diff --git a/tests/misc/pwd-unreadable-parent b/tests/misc/pwd-unreadable-parent
index 165cd79a1..75df827f2 100755
--- a/tests/misc/pwd-unreadable-parent
+++ b/tests/misc/pwd-unreadable-parent
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
readlink --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
test $host_os != linux-gnu &&
skip_test_ 'vendor getcwd may be inadequate'
diff --git a/tests/misc/readlink-fp-loop b/tests/misc/readlink-fp-loop
index 99c1ec073..7ac54b9a9 100755
--- a/tests/misc/readlink-fp-loop
+++ b/tests/misc/readlink-fp-loop
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
readlink --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 77637a30a..07dd08116 100755
--- a/tests/misc/runcon-no-reorder
+++ b/tests/misc/runcon-no-reorder
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
runcon --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
cat <<\EOF > exp || framework_failure
runcon: runcon may be used only on a SELinux kernel
diff --git a/tests/misc/selinux b/tests/misc/selinux
index 87b3af250..8065182f5 100755
--- a/tests/misc/selinux
+++ b/tests/misc/selinux
@@ -10,7 +10,7 @@ if test "$VERBOSE" = yes; then
stat --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
require_selinux_
skip_if_mcstransd_is_running_
diff --git a/tests/misc/shred-exact b/tests/misc/shred-exact
index ea465902f..d90a80e03 100755
--- a/tests/misc/shred-exact
+++ b/tests/misc/shred-exact
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
shred --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/shred-remove b/tests/misc/shred-remove
index f69166a9d..a5dc6f12d 100755
--- a/tests/misc/shred-remove
+++ b/tests/misc/shred-remove
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
shred --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
# The length of the basename is what matters.
diff --git a/tests/misc/shuf b/tests/misc/shuf
index 2231dcd53..97109498f 100755
--- a/tests/misc/shuf
+++ b/tests/misc/shuf
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
shuf --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
seq 100 > in || framework_failure
diff --git a/tests/misc/sort-compress b/tests/misc/sort-compress
index a555b26df..f3c473597 100755
--- a/tests/misc/sort-compress
+++ b/tests/misc/sort-compress
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
sort --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
seq -w 2000 > exp || framework_failure
tac exp > in || framework_failure
diff --git a/tests/misc/sort-rand b/tests/misc/sort-rand
index c42d16f5a..f675c956c 100755
--- a/tests/misc/sort-rand
+++ b/tests/misc/sort-rand
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
sort --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
seq 100 > in || framework_failure
diff --git a/tests/misc/split-a b/tests/misc/split-a
index cde48559e..b39009942 100755
--- a/tests/misc/split-a
+++ b/tests/misc/split-a
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
split --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/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 d15dd9244..0334c2d14 100755
--- a/tests/misc/split-fail
+++ b/tests/misc/split-fail
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
split --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch in || framework_failure
diff --git a/tests/misc/split-l b/tests/misc/split-l
index f2f23835f..453f1008f 100755
--- a/tests/misc/split-l
+++ b/tests/misc/split-l
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
ln --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
printf '1\n2\n3\n4\n5\n' > in || framework_failure
diff --git a/tests/misc/stat-fmt b/tests/misc/stat-fmt
index e19fb1271..f169166b1 100755
--- a/tests/misc/stat-fmt
+++ b/tests/misc/stat-fmt
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
stat --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/stty b/tests/misc/stty
index 8c4815b2d..8b5fbff00 100755
--- a/tests/misc/stty
+++ b/tests/misc/stty
@@ -22,8 +22,8 @@ if test "$VERBOSE" = yes; then
fi
# Make sure there's a tty on stdin.
-. $top_srcdir/tests/input-tty
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/input-tty
+. $srcdir/test-lib.sh
# The following list of reversible options was generated with
# grep -w REV stty.c|sed -n '/^ {"/{s//REV_/;s/".*/=1/;p;}'|fmt
diff --git a/tests/misc/stty-invalid b/tests/misc/stty-invalid
index d478765ed..168bb59af 100755
--- a/tests/misc/stty-invalid
+++ b/tests/misc/stty-invalid
@@ -22,8 +22,8 @@ if test "$VERBOSE" = yes; then
fi
# Make sure there's a tty on stdin.
-. $top_srcdir/tests/input-tty
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/input-tty
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/stty-row-col b/tests/misc/stty-row-col
index d5d751070..7fc917fa4 100755
--- a/tests/misc/stty-row-col
+++ b/tests/misc/stty-row-col
@@ -37,8 +37,8 @@ LC_ALL=C
export LC_ALL
# Make sure there's a tty on stdin.
-. $top_srcdir/tests/input-tty
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/input-tty
+. $srcdir/test-lib.sh
# Versions of GNU stty from shellutils-1.9.2c and earlier failed
# tests #2 and #4 when run on SunOS 4.1.3.
diff --git a/tests/misc/sum-sysv b/tests/misc/sum-sysv
index e5361832d..8766449ef 100755
--- a/tests/misc/sum-sysv
+++ b/tests/misc/sum-sysv
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
fi
: ${srcdir=.}
-. $top_srcdir/tests/require-perl
+. $srcdir/require-perl
# Avoid a problem when run in a UTF-8 locale.
# Otherwise, Perl would try to (and fail to) interpret
@@ -30,7 +30,7 @@ fi
LC_ALL=C
export LC_ALL
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/misc/tac-continue b/tests/misc/tac-continue
index c8da320e1..ce41a525c 100755
--- a/tests/misc/tac-continue
+++ b/tests/misc/tac-continue
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
tac --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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 e73619fdf..adf0caa0b 100755
--- a/tests/misc/tee
+++ b/tests/misc/tee
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
tee --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
echo line >sample || framework_failure
nums=`seq 9` || framework_failure
diff --git a/tests/misc/tee-dash b/tests/misc/tee-dash
index 7b330f97c..2564117f1 100755
--- a/tests/misc/tee-dash
+++ b/tests/misc/tee-dash
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
tee --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
tee - </dev/null || fail=1
diff --git a/tests/misc/wc-files0 b/tests/misc/wc-files0
index d80911dbd..aa2221e86 100755
--- a/tests/misc/wc-files0
+++ b/tests/misc/wc-files0
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
wc --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
echo 2 > 2b || framework_failure
echo 2 words > 2w || framework_failure
diff --git a/tests/mkdir/p-1 b/tests/mkdir/p-1
index 95b26be8a..85a2458e6 100755
--- a/tests/mkdir/p-1
+++ b/tests/mkdir/p-1
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
mkdir --parents "`pwd`/t" || fail=1
diff --git a/tests/mkdir/p-2 b/tests/mkdir/p-2
index bbf391304..7daf0b5fa 100755
--- a/tests/mkdir/p-2
+++ b/tests/mkdir/p-2
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
mkdir --parents "`pwd`/t/u" || fail=1
diff --git a/tests/mkdir/p-3 b/tests/mkdir/p-3
index e05021ff2..54052f171 100755
--- a/tests/mkdir/p-3
+++ b/tests/mkdir/p-3
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir no-access || framework_failure
diff --git a/tests/mkdir/p-slashdot b/tests/mkdir/p-slashdot
index 273b7b7e3..d2c3f983c 100755
--- a/tests/mkdir/p-slashdot
+++ b/tests/mkdir/p-slashdot
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/mkdir/p-thru-slink b/tests/mkdir/p-thru-slink
index c32619140..accdc7985 100755
--- a/tests/mkdir/p-thru-slink
+++ b/tests/mkdir/p-thru-slink
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
ln -s . slink || framework_failure
diff --git a/tests/mkdir/p-v b/tests/mkdir/p-v
index b3759d559..27696b52d 100755
--- a/tests/mkdir/p-v
+++ b/tests/mkdir/p-v
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
mkdir -pv foo/a/b/c/d >out || fail=1
diff --git a/tests/mkdir/parents b/tests/mkdir/parents
index 2aee87e6f..5433ee0b8 100755
--- a/tests/mkdir/parents
+++ b/tests/mkdir/parents
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
. "$abs_srcdir/setgid-check"
mkdir -m 700 e-dir || framework_failure
diff --git a/tests/mkdir/perm b/tests/mkdir/perm
index 6df1d4339..4fa9b5604 100755
--- a/tests/mkdir/perm
+++ b/tests/mkdir/perm
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
. "$abs_srcdir/setgid-check"
working_umask_or_skip_
diff --git a/tests/mkdir/selinux b/tests/mkdir/selinux
index 31b1f3e23..291d62da1 100755
--- a/tests/mkdir/selinux
+++ b/tests/mkdir/selinux
@@ -27,7 +27,7 @@ fi
# mcstrans-0.2.8-1.fc9, the following commands may mistakenly exit
# successfully, in spite of the invalid context string.
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
c=invalid-selinux-context
msg="failed to set default file creation context to \`$c':"
diff --git a/tests/mkdir/special-1 b/tests/mkdir/special-1
index 10d5b86aa..9d13cbad9 100755
--- a/tests/mkdir/special-1
+++ b/tests/mkdir/special-1
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 fdb5e8692..e95b0529b 100755
--- a/tests/mkdir/t-slash
+++ b/tests/mkdir/t-slash
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/mkdir/writable-under-readonly b/tests/mkdir/writable-under-readonly
index ebca859b8..1057b445b 100755
--- a/tests/mkdir/writable-under-readonly
+++ b/tests/mkdir/writable-under-readonly
@@ -29,7 +29,7 @@ if test "$VERBOSE" = yes; then
mkdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
# FIXME: for now, skip it unconditionally
diff --git a/tests/mv/acl b/tests/mv/acl
index 536391a68..e9121a59b 100755
--- a/tests/mv/acl
+++ b/tests/mv/acl
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
setfacl --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_acl_
# Skip this test if cp was built without ACL support:
diff --git a/tests/mv/atomic b/tests/mv/atomic
index e0e8adce1..b360e13eb 100755
--- a/tests/mv/atomic
+++ b/tests/mv/atomic
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_strace_ unlink
# Before the fix, mv would unnecessarily unlink the destination symlink:
diff --git a/tests/mv/atomic2 b/tests/mv/atomic2
index 4d2b4fc08..796d9c499 100755
--- a/tests/mv/atomic2
+++ b/tests/mv/atomic2
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 e3b42fbbb..28876a007 100755
--- a/tests/mv/backup-dir
+++ b/tests/mv/backup-dir
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 3c41ecba8..eee4fd9d8 100755
--- a/tests/mv/backup-is-src
+++ b/tests/mv/backup-is-src
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/childproof b/tests/mv/childproof
index 1fa77dc01..dffdf40c1 100755
--- a/tests/mv/childproof
+++ b/tests/mv/childproof
@@ -25,7 +25,7 @@ if test "$VERBOSE" = yes; then
ln --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir a b c || framework_failure
diff --git a/tests/mv/diag b/tests/mv/diag
index 413da6fa6..ef25d8092 100755
--- a/tests/mv/diag
+++ b/tests/mv/diag
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
fi
# Make sure we get English translations.
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch f1 || framework_failure
touch f2 || framework_failure
diff --git a/tests/mv/dir-file b/tests/mv/dir-file
index 589944191..38217e0f3 100755
--- a/tests/mv/dir-file
+++ b/tests/mv/dir-file
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir -p dir/file || framework_failure
> file || framework_failure
diff --git a/tests/mv/dir2dir b/tests/mv/dir2dir
index 76622dc0a..9a038814a 100755
--- a/tests/mv/dir2dir
+++ b/tests/mv/dir2dir
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir -p a/t b/t || framework_failure
touch a/t/f || framework_failure
diff --git a/tests/mv/dup-source b/tests/mv/dup-source
index edb539733..d7b56e854 100755
--- a/tests/mv/dup-source
+++ b/tests/mv/dup-source
@@ -25,7 +25,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
fail=0
diff --git a/tests/mv/force b/tests/mv/force
index 05d7f0446..f2eaf918e 100755
--- a/tests/mv/force
+++ b/tests/mv/force
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
ff=mvforce
ff2=mvforce2
diff --git a/tests/mv/hard-2 b/tests/mv/hard-2
index 7813f8a95..aaf9349af 100755
--- a/tests/mv/hard-2
+++ b/tests/mv/hard-2
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir dst || framework_failure
diff --git a/tests/mv/hard-3 b/tests/mv/hard-3
index 359a74dba..a2fa4e759 100755
--- a/tests/mv/hard-3
+++ b/tests/mv/hard-3
@@ -35,7 +35,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir -p x dst/x || framework_failure
diff --git a/tests/mv/hard-4 b/tests/mv/hard-4
index b082c1b21..881cab518 100755
--- a/tests/mv/hard-4
+++ b/tests/mv/hard-4
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch a || framework_failure
ln a b || framework_failure
diff --git a/tests/mv/hard-link-1 b/tests/mv/hard-link-1
index fd586aeca..864fd0318 100755
--- a/tests/mv/hard-link-1
+++ b/tests/mv/hard-link-1
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/hard-verbose b/tests/mv/hard-verbose
index 3a2456633..0b4a12903 100755
--- a/tests/mv/hard-verbose
+++ b/tests/mv/hard-verbose
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch x || framework_failure
ln x y || framework_failure
diff --git a/tests/mv/i-2 b/tests/mv/i-2
index 4153dc98f..1cc139497 100755
--- a/tests/mv/i-2
+++ b/tests/mv/i-2
@@ -26,7 +26,7 @@ fi
# Make sure we get English translations.
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
for i in a b c d e f g h; do
diff --git a/tests/mv/i-3 b/tests/mv/i-3
index 3052526e9..eed3c8b66 100755
--- a/tests/mv/i-3
+++ b/tests/mv/i-3
@@ -22,8 +22,8 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/input-tty
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/input-tty
+. $srcdir/test-lib.sh
skip_if_root_
touch f g h i || framework_failure
diff --git a/tests/mv/i-4 b/tests/mv/i-4
index e1a2c1cae..5de59b43b 100755
--- a/tests/mv/i-4
+++ b/tests/mv/i-4
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
for i in a b; do
echo $i > $i || framework_failure
diff --git a/tests/mv/i-5 b/tests/mv/i-5
index 3b2e27d15..da9716888 100755
--- a/tests/mv/i-5
+++ b/tests/mv/i-5
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir a || framework_failure
touch b || framework_failure
diff --git a/tests/mv/i-link-no b/tests/mv/i-link-no
index 2eddf8513..b32287259 100755
--- a/tests/mv/i-link-no
+++ b/tests/mv/i-link-no
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir a b || framework_failure
echo foo > a/foo || framework_failure
diff --git a/tests/mv/into-self b/tests/mv/into-self
index e9273d16a..915194f60 100755
--- a/tests/mv/into-self
+++ b/tests/mv/into-self
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
dir=toself-dir
file=toself-file
diff --git a/tests/mv/into-self-2 b/tests/mv/into-self-2
index ffc97c316..13e996a22 100755
--- a/tests/mv/into-self-2
+++ b/tests/mv/into-self-2
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 3235b7f95..3b967322f 100755
--- a/tests/mv/into-self-3
+++ b/tests/mv/into-self-3
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
dir1=is3-dir1
dir2=is3-dir2
diff --git a/tests/mv/into-self-4 b/tests/mv/into-self-4
index 39e053d61..9f001139f 100755
--- a/tests/mv/into-self-4
+++ b/tests/mv/into-self-4
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch file || framework_failure
ln -s file s || framework_failure
diff --git a/tests/mv/leak-fd b/tests/mv/leak-fd
index 127a826ab..1141b7303 100755
--- a/tests/mv/leak-fd
+++ b/tests/mv/leak-fd
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/mv-special-1 b/tests/mv/mv-special-1
index ff4869fc2..f10dc10ef 100755
--- a/tests/mv/mv-special-1
+++ b/tests/mv/mv-special-1
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 ba9a6b0a9..7df1fb99f 100755
--- a/tests/mv/no-target-dir
+++ b/tests/mv/no-target-dir
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 fdbab1d7d..60c421031 100755
--- a/tests/mv/part-fail
+++ b/tests/mv/part-fail
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 8f83fcf27..3eaa083cd 100755
--- a/tests/mv/part-hardlink
+++ b/tests/mv/part-hardlink
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/part-rename b/tests/mv/part-rename
index 009c6d443..8bff9915f 100755
--- a/tests/mv/part-rename
+++ b/tests/mv/part-rename
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/part-symlink b/tests/mv/part-symlink
index 68c46f9ea..926252493 100755
--- a/tests/mv/part-symlink
+++ b/tests/mv/part-symlink
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
cp --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/partition-perm b/tests/mv/partition-perm
index a8ca44c8e..03f169ebb 100755
--- a/tests/mv/partition-perm
+++ b/tests/mv/partition-perm
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/perm-1 b/tests/mv/perm-1
index 8a359ff71..95bbccb8d 100755
--- a/tests/mv/perm-1
+++ b/tests/mv/perm-1
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir -p no-write/dir || framework_failure
diff --git a/tests/mv/reply-no b/tests/mv/reply-no
index e3947724f..42967c866 100755
--- a/tests/mv/reply-no
+++ b/tests/mv/reply-no
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
touch a b || framework_failure
diff --git a/tests/mv/sticky-to-xpart b/tests/mv/sticky-to-xpart
index 38f383692..14cb76211 100755
--- a/tests/mv/sticky-to-xpart
+++ b/tests/mv/sticky-to-xpart
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
cleanup_() { rm -rf "$other_partition_tmpdir"; }
diff --git a/tests/mv/to-symlink b/tests/mv/to-symlink
index 12f1447d1..560d63de9 100755
--- a/tests/mv/to-symlink
+++ b/tests/mv/to-symlink
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
cleanup_() { rm -rf "$other_partition_tmpdir"; }
. "$abs_srcdir/other-fs-tmpdir"
diff --git a/tests/mv/trailing-slash b/tests/mv/trailing-slash
index 0a2a361b0..eea982f3e 100755
--- a/tests/mv/trailing-slash
+++ b/tests/mv/trailing-slash
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir foo || framework_failure
diff --git a/tests/mv/update b/tests/mv/update
index 7edb99a75..15e6fa762 100755
--- a/tests/mv/update
+++ b/tests/mv/update
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
mv --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
echo old > old || framework_failure
touch -d yesterday old || framework_failure
diff --git a/tests/readlink/can-e b/tests/readlink/can-e
index 500bbc582..72c2c5cd3 100755
--- a/tests/readlink/can-e
+++ b/tests/readlink/can-e
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
readlink --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
pwd=`pwd`
my_pwd=$("$abs_top_builddir/src/pwd")
diff --git a/tests/readlink/can-f b/tests/readlink/can-f
index 3ddfb8dbc..67f84b92f 100755
--- a/tests/readlink/can-f
+++ b/tests/readlink/can-f
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
readlink --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
pwd=`pwd`
my_pwd=$("$abs_top_builddir/src/pwd")
diff --git a/tests/readlink/can-m b/tests/readlink/can-m
index e6a3e7589..24f98c985 100755
--- a/tests/readlink/can-m
+++ b/tests/readlink/can-m
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
readlink --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
pwd=`pwd`
my_pwd=$("$abs_top_builddir/src/pwd")
diff --git a/tests/readlink/rl-1 b/tests/readlink/rl-1
index c2fbcd4d5..91401b0f4 100755
--- a/tests/readlink/rl-1
+++ b/tests/readlink/rl-1
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
readlink --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir subdir || framework_failure
touch regfile || framework_failure
diff --git a/tests/rm/cycle b/tests/rm/cycle
index 5daf716ef..4c9f04d03 100755
--- a/tests/rm/cycle
+++ b/tests/rm/cycle
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir -p a/b
diff --git a/tests/rm/dangling-symlink b/tests/rm/dangling-symlink
index 8292ed7e4..7581be22f 100755
--- a/tests/rm/dangling-symlink
+++ b/tests/rm/dangling-symlink
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
ln -s no-file dangle
ln -s / symlink
diff --git a/tests/rm/deep-1 b/tests/rm/deep-1
index 25239d606..34e9e1919 100755
--- a/tests/rm/deep-1
+++ b/tests/rm/deep-1
@@ -28,7 +28,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
umask 022
diff --git a/tests/rm/deep-2 b/tests/rm/deep-2
index 277a0b664..ed84c66ea 100755
--- a/tests/rm/deep-2
+++ b/tests/rm/deep-2
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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 94f53e64c..35ab1852d 100755
--- a/tests/rm/dir-no-w
+++ b/tests/rm/dir-no-w
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir --mode=0500 unwritable-dir || framework_failure
diff --git a/tests/rm/dir-nonrecur b/tests/rm/dir-nonrecur
index 32cabc626..064ef5d43 100755
--- a/tests/rm/dir-nonrecur
+++ b/tests/rm/dir-nonrecur
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir d || framework_failure
diff --git a/tests/rm/dot-rel b/tests/rm/dot-rel
index 256abcba1..0d0e1a1de 100755
--- a/tests/rm/dot-rel
+++ b/tests/rm/dot-rel
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 d0b661f7c..e89d103f2 100755
--- a/tests/rm/empty-inacc
+++ b/tests/rm/empty-inacc
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir -m0 inacc || framework_failure
diff --git a/tests/rm/f-1 b/tests/rm/f-1
index 5d80d8517..acd241a20 100755
--- a/tests/rm/f-1
+++ b/tests/rm/f-1
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir -p d || framework_failure
diff --git a/tests/rm/fail-2eperm b/tests/rm/fail-2eperm
index 6e98baa63..132e22cec 100755
--- a/tests/rm/fail-2eperm
+++ b/tests/rm/fail-2eperm
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 d2b5b04e0..916b2577b 100755
--- a/tests/rm/fail-eacces
+++ b/tests/rm/fail-eacces
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
ok=0
diff --git a/tests/rm/hash b/tests/rm/hash
index 56f96e412..abb7ffd04 100755
--- a/tests/rm/hash
+++ b/tests/rm/hash
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 15fd94f97..d19ebeaec 100755
--- a/tests/rm/i-1
+++ b/tests/rm/i-1
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
t=t
mkdir -p $t || framework_failure
diff --git a/tests/rm/i-never b/tests/rm/i-never
index 24035f3c8..244054ab7 100755
--- a/tests/rm/i-never
+++ b/tests/rm/i-never
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
touch f || framework_failure
diff --git a/tests/rm/i-no-r b/tests/rm/i-no-r
index d2b2c1062..f028b6357 100755
--- a/tests/rm/i-no-r
+++ b/tests/rm/i-no-r
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir dir || framework_failure
echo y > y || framework_failure
diff --git a/tests/rm/ignorable b/tests/rm/ignorable
index 0473a2039..37e0150f4 100755
--- a/tests/rm/ignorable
+++ b/tests/rm/ignorable
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
touch existing-non-dir || framework_failure
diff --git a/tests/rm/inaccessible b/tests/rm/inaccessible
index 2f86b034b..35cddc599 100755
--- a/tests/rm/inaccessible
+++ b/tests/rm/inaccessible
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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 a6d08f3ba..382cc6ff1 100755
--- a/tests/rm/interactive-always
+++ b/tests/rm/interactive-always
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 4c925161e..6238f3fcf 100755
--- a/tests/rm/interactive-once
+++ b/tests/rm/interactive-once
@@ -23,7 +23,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 21bd8f0a7..c3cdc0be8 100755
--- a/tests/rm/ir-1
+++ b/tests/rm/ir-1
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
t=t
mkdir -p $t $t/a $t/b $t/c || framework_failure
diff --git a/tests/rm/isatty b/tests/rm/isatty
index 382f30a25..596887311 100755
--- a/tests/rm/isatty
+++ b/tests/rm/isatty
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
fail=0
diff --git a/tests/rm/no-give-up b/tests/rm/no-give-up
index aa31d93f9..b888296c8 100755
--- a/tests/rm/no-give-up
+++ b/tests/rm/no-give-up
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
mkdir d || framework_failure
diff --git a/tests/rm/one-file-system b/tests/rm/one-file-system
index 0030f3437..419ada201 100755
--- a/tests/rm/one-file-system
+++ b/tests/rm/one-file-system
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
# If used, these must *follow* test-lib.sh.
diff --git a/tests/rm/r-1 b/tests/rm/r-1
index 97f00c67f..ec846fb8d 100755
--- a/tests/rm/r-1
+++ b/tests/rm/r-1
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir a a/a || framework_failure
> b || framework_failure
diff --git a/tests/rm/r-2 b/tests/rm/r-2
index f3e1cfa70..0bf6756de 100755
--- a/tests/rm/r-2
+++ b/tests/rm/r-2
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 26355600a..9c31d881f 100755
--- a/tests/rm/r-3
+++ b/tests/rm/r-3
@@ -28,7 +28,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir t || framework_failure
cd t || framework_failure
diff --git a/tests/rm/r-4 b/tests/rm/r-4
index 7430273a0..3d2107914 100755
--- a/tests/rm/r-4
+++ b/tests/rm/r-4
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir d || framework_failure
touch d/a || framework_failure
diff --git a/tests/rm/readdir-bug b/tests/rm/readdir-bug
index 6b81a746b..15dc74125 100755
--- a/tests/rm/readdir-bug
+++ b/tests/rm/readdir-bug
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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 110a82d9e..70bc0e8b4 100755
--- a/tests/rm/rm1
+++ b/tests/rm/rm1
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 8df52c861..853f4e2ac 100755
--- a/tests/rm/rm2
+++ b/tests/rm/rm2
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir -p a/0 || framework_failure
diff --git a/tests/rm/rm3 b/tests/rm/rm3
index 1682ea3ec..c5630a269 100755
--- a/tests/rm/rm3
+++ b/tests/rm/rm3
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir -p z || framework_failure
diff --git a/tests/rm/rm4 b/tests/rm/rm4
index 0b6ab6988..2fbf317a1 100755
--- a/tests/rm/rm4
+++ b/tests/rm/rm4
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir dir || framework_failure
diff --git a/tests/rm/rm5 b/tests/rm/rm5
index e9c94ad26..f54d640a0 100755
--- a/tests/rm/rm5
+++ b/tests/rm/rm5
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir -p d/e || framework_failure
diff --git a/tests/rm/sunos-1 b/tests/rm/sunos-1
index 03200bf36..ce1016e1f 100755
--- a/tests/rm/sunos-1
+++ b/tests/rm/sunos-1
@@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
rm -r '' > /dev/null 2>&1 && fail=1
diff --git a/tests/rm/unread2 b/tests/rm/unread2
index 7f582d0be..005c4255c 100755
--- a/tests/rm/unread2
+++ b/tests/rm/unread2
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
mkdir -p a/b || framework_failure
diff --git a/tests/rm/unread3 b/tests/rm/unread3
index 36e93bbe3..e79bd6003 100755
--- a/tests/rm/unread3
+++ b/tests/rm/unread3
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 a942f1f5b..3a9d5411a 100755
--- a/tests/rm/v-slash
+++ b/tests/rm/v-slash
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rm --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir a || framework_failure
touch a/x || framework_failure
diff --git a/tests/rmdir/fail-perm b/tests/rmdir/fail-perm
index bbfcad838..9eeb633ea 100755
--- a/tests/rmdir/fail-perm
+++ b/tests/rmdir/fail-perm
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
rmdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 70b294490..e55ae1f64 100755
--- a/tests/rmdir/ignore
+++ b/tests/rmdir/ignore
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rmdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 cd4dad34b..923e9c9c9 100755
--- a/tests/rmdir/t-slash
+++ b/tests/rmdir/t-slash
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
rmdir --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkdir dir || framework_failure
diff --git a/tests/sample-test b/tests/sample-test
index a9ec3a48c..67bc0d1fc 100644
--- a/tests/sample-test
+++ b/tests/sample-test
@@ -21,8 +21,8 @@ if test "$VERBOSE" = yes; then
FIXME --version
fi
-# FIXME: . $top_srcdir/tests/lang-default
-. $top_srcdir/tests/test-lib.sh
+# FIXME: . $srcdir/lang-default
+. $srcdir/test-lib.sh
# FIXME: skip_if_root_
# FIXME: require_root_
diff --git a/tests/tail-2/append-only b/tests/tail-2/append-only
index e061b125e..fc761006b 100755
--- a/tests/tail-2/append-only
+++ b/tests/tail-2/append-only
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
tail --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
chattr_a_works=1
diff --git a/tests/tail-2/assert b/tests/tail-2/assert
index 88371c2d1..309d12d8d 100755
--- a/tests/tail-2/assert
+++ b/tests/tail-2/assert
@@ -29,7 +29,7 @@ if test "$VERBOSE" = yes; then
fi
# Not "expensive" per se, but sleeping for so long is annoying.
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
very_expensive_
ok='ok ok ok'
diff --git a/tests/tail-2/assert-2 b/tests/tail-2/assert-2
index 4cfd6fbb2..4c6f4a9f3 100755
--- a/tests/tail-2/assert-2
+++ b/tests/tail-2/assert-2
@@ -24,7 +24,7 @@ if test "$VERBOSE" = yes; then
fi
# Not "expensive" per se, but sleeping for so long is annoying.
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
very_expensive_
ok='ok ok ok'
diff --git a/tests/tail-2/big-4gb b/tests/tail-2/big-4gb
index 8b64c6ef7..b362aeb3d 100755
--- a/tests/tail-2/big-4gb
+++ b/tests/tail-2/big-4gb
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
tail --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
expensive_
# Create a file of size exactly 4GB (2^32) with 8 bytes
diff --git a/tests/tail-2/infloop-1 b/tests/tail-2/infloop-1
index 4015fcb06..c18c3e670 100755
--- a/tests/tail-2/infloop-1
+++ b/tests/tail-2/infloop-1
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
tail --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
yes > t &
yes_pid=$!
diff --git a/tests/tail-2/proc-ksyms b/tests/tail-2/proc-ksyms
index ccd4fdccc..84566b542 100755
--- a/tests/tail-2/proc-ksyms
+++ b/tests/tail-2/proc-ksyms
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
tail --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/tail-2/start-middle b/tests/tail-2/start-middle
index d11eaec60..3151e9d09 100755
--- a/tests/tail-2/start-middle
+++ b/tests/tail-2/start-middle
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
tail --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
(echo 1; echo 2) > k || framework_failure
diff --git a/tests/tail-2/tail-n0f b/tests/tail-2/tail-n0f
index c07b30c49..4a22541d8 100755
--- a/tests/tail-2/tail-n0f
+++ b/tests/tail-2/tail-n0f
@@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then
tail --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
sleep 2 &
pid=$!
diff --git a/tests/touch/dangling-symlink b/tests/touch/dangling-symlink
index 66392a5fc..aedb4afb2 100755
--- a/tests/touch/dangling-symlink
+++ b/tests/touch/dangling-symlink
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 e48484a2a..34023072f 100755
--- a/tests/touch/dir-1
+++ b/tests/touch/dir-1
@@ -7,7 +7,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
touch . || fail=1
diff --git a/tests/touch/empty-file b/tests/touch/empty-file
index 1020a378d..0f42ba57e 100755
--- a/tests/touch/empty-file
+++ b/tests/touch/empty-file
@@ -26,7 +26,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
DEFAULT_SLEEP_SECONDS=2
SLEEP_SECONDS=${SLEEP_SECONDS=$DEFAULT_SLEEP_SECONDS}
diff --git a/tests/touch/fail-diag b/tests/touch/fail-diag
index 1df8e5494..b8889121b 100755
--- a/tests/touch/fail-diag
+++ b/tests/touch/fail-diag
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
d1=no-$$
diff --git a/tests/touch/fifo b/tests/touch/fifo
index 22cde83a7..9cd2d0171 100755
--- a/tests/touch/fifo
+++ b/tests/touch/fifo
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
mkfifo_or_skip_ fifo
diff --git a/tests/touch/no-create-missing b/tests/touch/no-create-missing
index a503ff752..be2d0dbf3 100755
--- a/tests/touch/no-create-missing
+++ b/tests/touch/no-create-missing
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
fail=0
diff --git a/tests/touch/no-rights b/tests/touch/no-rights
index 9466166ce..7550bae5e 100755
--- a/tests/touch/no-rights
+++ b/tests/touch/no-rights
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
# 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 f3b294d78..adcdaa87a 100755
--- a/tests/touch/not-owner
+++ b/tests/touch/not-owner
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
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 2f85850bb..2c1faefef 100755
--- a/tests/touch/now-owned-by-other
+++ b/tests/touch/now-owned-by-other
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
require_root_
group_num=$(id -g $NON_ROOT_USERNAME)
diff --git a/tests/touch/obsolescent b/tests/touch/obsolescent
index 25f73828a..8b558777e 100755
--- a/tests/touch/obsolescent
+++ b/tests/touch/obsolescent
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
_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 47b7eb20d..e2338c51c 100755
--- a/tests/touch/read-only
+++ b/tests/touch/read-only
@@ -21,7 +21,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
skip_if_root_
: > read-only || framework_failure
diff --git a/tests/touch/relative b/tests/touch/relative
index 6a5d100f1..7c1396f15 100755
--- a/tests/touch/relative
+++ b/tests/touch/relative
@@ -22,7 +22,7 @@ if test "$VERBOSE" = yes; then
touch --version
fi
-. $top_srcdir/tests/test-lib.sh
+. $srcdir/test-lib.sh
TZ=UTC0 touch --date='2004-01-16 12:00 +0000' f || framework_failure