summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-05-17 15:07:24 -0700
committerWayne Davison <wayned@samba.org>2008-05-17 15:07:24 -0700
commite717fa4d37bf6cad4b3117998c220478f64b2eb2 (patch)
treec2ad54ff5f4b5a4c0068c2553f83eab296f4b23c /testsuite
parentcc56eb2acca94ac29149d4a838fe43db6edc3867 (diff)
downloadrsync-e717fa4d37bf6cad4b3117998c220478f64b2eb2.tar.gz
rsync-e717fa4d37bf6cad4b3117998c220478f64b2eb2.tar.bz2
rsync-e717fa4d37bf6cad4b3117998c220478f64b2eb2.zip
Fix some path problems when the build dir is not the
source dir.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/hardlinks.test2
-rw-r--r--testsuite/itemize.test3
-rw-r--r--testsuite/ssh-basic.test2
3 files changed, 3 insertions, 4 deletions
diff --git a/testsuite/hardlinks.test b/testsuite/hardlinks.test
index 6de330a1..1737b352 100644
--- a/testsuite/hardlinks.test
+++ b/testsuite/hardlinks.test
@@ -11,7 +11,7 @@
. "$suitedir/rsync.fns"
-SSH=support/lsh
+SSH="$scratchdir/src/support/lsh"
outfile="$scratchdir/rsync.out"
diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index 72780345..bdb08c2f 100644
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -28,8 +28,7 @@ ln "$fromdir/foo/config1" "$fromdir/foo/extra"
rm -f "$to2dir"
# Check if rsync is set to hard-link symlinks.
-confile=`echo "$scratchdir" | sed 's;/testtmp/itemize$;/config.h;'`
-if egrep '^#define CAN_HARDLINK_SYMLINK 1' "$confile" >/dev/null; then
+if egrep '^#define CAN_HARDLINK_SYMLINK 1' config.h >/dev/null; then
L=hL
else
L=cL
diff --git a/testsuite/ssh-basic.test b/testsuite/ssh-basic.test
index 10b2c884..59144119 100644
--- a/testsuite/ssh-basic.test
+++ b/testsuite/ssh-basic.test
@@ -10,7 +10,7 @@
. "$suitedir/rsync.fns"
-SSH=support/lsh
+SSH="$scratchdir/src/support/lsh"
if test x"$rsync_enable_ssh_tests" = xyes; then
if type ssh >/dev/null ; then