From 00a309823501317f9061a28e98cc13177bc4a12a Mon Sep 17 00:00:00 2001
From: Jim Meyering <meyering@redhat.com>
Date: Tue, 27 May 2008 13:45:44 +0200
Subject: in 280+ tests/* files, use $srcdir, not $top_srcdir/tests

---
 tests/rm/cycle              | 2 +-
 tests/rm/dangling-symlink   | 2 +-
 tests/rm/deep-1             | 2 +-
 tests/rm/deep-2             | 2 +-
 tests/rm/dir-no-w           | 2 +-
 tests/rm/dir-nonrecur       | 2 +-
 tests/rm/dot-rel            | 2 +-
 tests/rm/empty-inacc        | 2 +-
 tests/rm/f-1                | 2 +-
 tests/rm/fail-2eperm        | 2 +-
 tests/rm/fail-eacces        | 2 +-
 tests/rm/hash               | 2 +-
 tests/rm/i-1                | 2 +-
 tests/rm/i-never            | 2 +-
 tests/rm/i-no-r             | 2 +-
 tests/rm/ignorable          | 2 +-
 tests/rm/inaccessible       | 2 +-
 tests/rm/interactive-always | 2 +-
 tests/rm/interactive-once   | 2 +-
 tests/rm/ir-1               | 2 +-
 tests/rm/isatty             | 2 +-
 tests/rm/no-give-up         | 2 +-
 tests/rm/one-file-system    | 2 +-
 tests/rm/r-1                | 2 +-
 tests/rm/r-2                | 2 +-
 tests/rm/r-3                | 2 +-
 tests/rm/r-4                | 2 +-
 tests/rm/readdir-bug        | 2 +-
 tests/rm/rm1                | 2 +-
 tests/rm/rm2                | 2 +-
 tests/rm/rm3                | 2 +-
 tests/rm/rm4                | 2 +-
 tests/rm/rm5                | 2 +-
 tests/rm/sunos-1            | 2 +-
 tests/rm/unread2            | 2 +-
 tests/rm/unread3            | 2 +-
 tests/rm/v-slash            | 2 +-
 37 files changed, 37 insertions(+), 37 deletions(-)

(limited to 'tests/rm')

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
-- 
cgit v1.2.3-54-g00ecf