- Use $suitedir to find rsync.fns.

- The values of fromdir, todir, and chkdir are already set.

diff --git a/testsuite/exclude.test b/testsuite/exclude.test
index cd41470..22d2757 100644 (file)
--- a/testsuite/exclude.test
+++ b/testsuite/exclude.test
@@ -10,7 +10,7 @@
 # Test some of the more obscure wildcard handling of exclude/include
 # processing.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
@@ -20,10 +20,6 @@ export HOME CVSIGNORE
 
 # Build some files/dirs/links to copy
 
-fromdir="$scratchdir/from"
-todir="$scratchdir/to"
-chkdir="$scratchdir/chk"
-
 echo home-cvs-exclude >"$scratchdir"/.cvsignore
 makepath "$fromdir/foo/down/to/you"
 makepath "$fromdir/bar/down/to/foo/too"

diff --git a/testsuite/merge.test b/testsuite/merge.test
index 43b89bc..0ef3984 100644 (file)
--- a/testsuite/merge.test
+++ b/testsuite/merge.test
@@ -7,18 +7,15 @@
 
 # Make sure we can merge files from multiple directories into one.
 
-. $srcdir/testsuite/rsync.fns
+. "$suitedir/rsync.fns"
 
 set -x
 
 # Build some files/dirs/links to copy
 
-fromdir="$scratchdir/from"
 from1dir="${fromdir}1"
 from2dir="${fromdir}2"
 from3dir="${fromdir}3"
-todir="$scratchdir/to"
-chkdir="$scratchdir/chk"
 
 mkdir "$from1dir" "$from2dir" "$from3dir"
 mkdir "$from2dir"/sub1 "$from3dir"/sub1