From: Wayne Davison <wayned@samba.org>
Date: Tue, 18 May 2004 00:41:40 +0000 (+0000)
Subject: Use $suitedir to find rsync.fns.
X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/e920830ec58994a4a0dff6a699e85ff303962904

Use $suitedir to find rsync.fns.
---

diff --git a/testsuite/hardlinks.test b/testsuite/hardlinks.test
index a3391c5e..31005e7b 100644
--- a/testsuite/hardlinks.test
+++ b/testsuite/hardlinks.test
@@ -10,7 +10,7 @@
 # specify -H, then hard links are detected and recreated as hardlinks
 # on the other end.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
diff --git a/testsuite/symlink-ignore.test b/testsuite/symlink-ignore.test
index 3f350211..42ce2d35 100644
--- a/testsuite/symlink-ignore.test
+++ b/testsuite/symlink-ignore.test
@@ -8,7 +8,7 @@
 # Test rsync's somewhat over-featured symlink control: the default
 # behaviour is that symlinks should not be copied at all.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
@@ -18,19 +18,19 @@ build_symlinks || test_fail "failed to build symlinks"
 # should be missing.
 $RSYNC -r "$fromdir/" "$todir" || test_fail "$RSYNC returned $?"
 
-[ -f "${todir}/referent" ] || test_fail "referent was not copied"
-[ -d "${todir}/from" ] && test_fail "extra level of directories"
-if is_a_link "${todir}/dangling" 
+[ -f "$todir/referent" ] || test_fail "referent was not copied"
+[ -d "$todir/from" ] && test_fail "extra level of directories"
+if is_a_link "$todir/dangling" 
 then 
     test_fail "dangling symlink was copied"
 fi
 
-if is_a_link "${todir}/relative" 
+if is_a_link "$todir/relative" 
 then
     test_fail "relative symlink was copied" 
 fi
 
-if is_a_link "${todir}/absolute" 
+if is_a_link "$todir/absolute" 
 then
     test_fail "absolute symlink was copied"
 fi
diff --git a/testsuite/trimslash.test b/testsuite/trimslash.test
index 4eac9ce8..56e79cc6 100644
--- a/testsuite/trimslash.test
+++ b/testsuite/trimslash.test
@@ -7,7 +7,7 @@
 
 # Test tiny function to trim trailing slashes.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
diff --git a/testsuite/unsafe-byname.test b/testsuite/unsafe-byname.test
index a4f5370f..61e0e24a 100644
--- a/testsuite/unsafe-byname.test
+++ b/testsuite/unsafe-byname.test
@@ -4,7 +4,7 @@
 
 # Call directly into unsafe_symlink and test its handling of various filenames
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 test_unsafe() {
     # $1 is the target of a symlink
diff --git a/testsuite/wildmatch.test b/testsuite/wildmatch.test
index 53123f47..71e0ff09 100644
--- a/testsuite/wildmatch.test
+++ b/testsuite/wildmatch.test
@@ -7,7 +7,7 @@
 
 # Test the wildmatch functionality
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x