- Use $suitedir to find rsync.fns.

- The values of fromdir and todir are already set.

diff --git a/testsuite/chgrp.test b/testsuite/chgrp.test
index 6c7bb606bb54c6d3dc80b31521c2b93a74c270be..12ffa415715dc299649313a4aaec1a85c9d0aafe 100644 (file)
--- a/testsuite/chgrp.test
+++ b/testsuite/chgrp.test
@@ -9,15 +9,12 @@
 # the test is a member of them.  Hopefully they're in at least one
 # test.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
 # Build some hardlinks
 
-fromdir="$scratchdir/from"
-todir="$scratchdir/to"
-
 mygrps="`rsync_getgroups`" || fail "Can't get groups"
 mkdir "$fromdir"
 

diff --git a/testsuite/chown.test b/testsuite/chown.test
index 2291eca52a678be343544577e77af6c88060cd90..755ffdf84730695ffc02181295c3e66f895232bb 100644 (file)
--- a/testsuite/chown.test
+++ b/testsuite/chown.test
@@ -11,15 +11,12 @@
 # We don't know what users will be present on this system, so we just
 # use random numeric uids and gids.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
 # Build some hardlinks
 
-fromdir="$scratchdir/from"
-todir="$scratchdir/to"
-
 mkdir "$fromdir"
 name1="$fromdir/name1"
 name2="$fromdir/name2"

diff --git a/testsuite/devices.test b/testsuite/devices.test
index 04b9e6a6dd79b9f800afff2cd19e025f757f4a02..ed84fb489c2b4bcccbfe10cd1de9b0f7c00d2eed 100644 (file)
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -7,15 +7,12 @@
 
 # Test rsync handling of devices.  This can only run if you're root.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
 # Build some hardlinks
 
-fromdir="$scratchdir/from"
-todir="$scratchdir/to"
-
 case `id -u` in
 '') ;; # If "id" failed, try to continue...
 0) ;;

diff --git a/testsuite/duplicates.test b/testsuite/duplicates.test
index 9b1a24ce30464313bd8e6cacd430edffb0ec2b97..23d2994e17fdc7357a832deafd71959e78e410ef 100644 (file)
--- a/testsuite/duplicates.test
+++ b/testsuite/duplicates.test
@@ -19,15 +19,12 @@
 
 # This test is not great, because it is a timing-dependent bug.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
 # Build some hardlinks
 
-fromdir="$scratchdir/from"
-todir="$scratchdir/to"
-
 mkdir "$fromdir"
 name1="$fromdir/name1"
 name2="$fromdir/name2"