From 217066780233f05c64bc75b3b0cc7f8512adcf9f Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayned@samba.org>
Date: Sat, 24 Oct 2009 11:42:29 -0700
Subject: [PATCH] Make use of $suitedir.

---
 testsuite/acls.test          | 2 +-
 testsuite/chmod-option.test  | 2 +-
 testsuite/default-acls.test  | 2 +-
 testsuite/dir-sgid.test      | 2 +-
 testsuite/executability.test | 2 +-
 testsuite/missing.test       | 2 +-
 testsuite/rsync.fns          | 3 +--
 testsuite/xattrs.test        | 2 +-
 8 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/testsuite/acls.test b/testsuite/acls.test
index fe827ba7..40490a67 100644
--- a/testsuite/acls.test
+++ b/testsuite/acls.test
@@ -5,7 +5,7 @@
 
 # Test that rsync handles basic ACL preservation.
 
-. $srcdir/testsuite/rsync.fns
+. $suitedir/rsync.fns
 
 $RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
 
diff --git a/testsuite/chmod-option.test b/testsuite/chmod-option.test
index 461690e0..81fd38c7 100644
--- a/testsuite/chmod-option.test
+++ b/testsuite/chmod-option.test
@@ -7,7 +7,7 @@
 
 # Test that the --chmod option functions correctly.
 
-. $srcdir/testsuite/rsync.fns
+. $suitedir/rsync.fns
 
 # Build some files
 
diff --git a/testsuite/default-acls.test b/testsuite/default-acls.test
index 42ed253a..eb41a6ff 100644
--- a/testsuite/default-acls.test
+++ b/testsuite/default-acls.test
@@ -5,7 +5,7 @@
 
 # Test that rsync obeys default ACLs. -- Matt McCutchen
 
-. $srcdir/testsuite/rsync.fns
+. $suitedir/rsync.fns
 
 $RSYNC --version | grep ", ACLs" >/dev/null || test_skipped "Rsync is configured without ACL support"
 
diff --git a/testsuite/dir-sgid.test b/testsuite/dir-sgid.test
index 8109b0ce..bbd86a61 100644
--- a/testsuite/dir-sgid.test
+++ b/testsuite/dir-sgid.test
@@ -5,7 +5,7 @@
 
 # Test that rsync obeys directory setgid. -- Matt McCutchen
 
-. $srcdir/testsuite/rsync.fns
+. $suitedir/rsync.fns
 
 umask 077
 
diff --git a/testsuite/executability.test b/testsuite/executability.test
index b11e6722..05a64e48 100644
--- a/testsuite/executability.test
+++ b/testsuite/executability.test
@@ -5,7 +5,7 @@
 
 # Test the --executability or -E option. -- Matt McCutchen
 
-. $srcdir/testsuite/rsync.fns
+. $suitedir/rsync.fns
 
 # Put some files in the From directory
 mkdir "$fromdir"
diff --git a/testsuite/missing.test b/testsuite/missing.test
index 82eaeb3c..008c0f4f 100644
--- a/testsuite/missing.test
+++ b/testsuite/missing.test
@@ -5,7 +5,7 @@
 
 # Test three bugs fixed by my redoing of the missing_below logic.
 
-. $srcdir/testsuite/rsync.fns
+. $suitedir/rsync.fns
 
 makepath "$fromdir/subdir" "$todir"
 echo data >"$fromdir/subdir/file"
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index b26aee32..19838776 100644
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -17,7 +17,6 @@
 # License along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-
 tmpdir="$scratchdir"
 fromdir="$tmpdir/from"
 todir="$tmpdir/to"
@@ -31,7 +30,7 @@ dots='.....' # trailing dots after changes
 # Berkley's nice.
 PATH="$PATH:/usr/ucb"
 
-if diff -u "$srcdir/testsuite/rsync.fns" "$srcdir/testsuite/rsync.fns" >/dev/null 2>&1; then
+if diff -u "$suitedir/rsync.fns" "$suitedir/rsync.fns" >/dev/null 2>&1; then
     diffopt="-u"
 else
     diffopt="-c"
diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
index 8b40eec3..76b90993 100644
--- a/testsuite/xattrs.test
+++ b/testsuite/xattrs.test
@@ -5,7 +5,7 @@
 
 # Test that rsync handles basic xattr preservation.
 
-. $srcdir/testsuite/rsync.fns
+. $suitedir/rsync.fns
 
 $RSYNC --version | grep ", xattrs" >/dev/null || test_skipped "Rsync is configured without xattr support"
 
-- 
2.34.1