diff options
| -rw-r--r-- | testsuite/exclude.test | 6 | ||||
| -rw-r--r-- | testsuite/merge.test | 5 |
2 files changed, 2 insertions, 9 deletions
diff --git a/testsuite/exclude.test b/testsuite/exclude.test index cd41470c..22d27573 100644 --- 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 43b89bc1..0ef39849 100644 --- 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 |