From 00a309823501317f9061a28e98cc13177bc4a12a Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 27 May 2008 13:45:44 +0200 Subject: in 280+ tests/* files, use $srcdir, not $top_srcdir/tests --- tests/ls/color-dtype-dir | 2 +- tests/ls/dangle | 2 +- tests/ls/dired | 2 +- tests/ls/file-type | 2 +- tests/ls/follow-slink | 2 +- tests/ls/infloop | 2 +- tests/ls/inode | 2 +- tests/ls/m-option | 2 +- tests/ls/nameless-uid | 4 ++-- tests/ls/no-arg | 2 +- tests/ls/proc-selinux-segfault | 2 +- tests/ls/recursive | 2 +- tests/ls/rt-1 | 2 +- tests/ls/stat-dtype | 2 +- tests/ls/stat-failed | 2 +- tests/ls/stat-free-symlinks | 2 +- tests/ls/stat-vs-dirent | 2 +- tests/ls/symlink-slash | 2 +- tests/ls/x-option | 2 +- 19 files changed, 20 insertions(+), 20 deletions(-) (limited to 'tests/ls') 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 -- cgit v1.2.3-54-g00ecf