Fix some path problems when the build dir is not the

source dir.

diff --git a/runtests.sh b/runtests.sh
index 5e54e17..2eb4182 100755 (executable)
--- a/runtests.sh
+++ b/runtests.sh
@@ -155,10 +155,10 @@ RSYNC="$rsync_bin $*"
 #RSYNC="valgrind $rsync_bin $*"
 
 TLS_ARGS=''
-if egrep '^#define HAVE_LUTIMES 1' "$srcdir/config.h" >/dev/null; then
+if egrep '^#define HAVE_LUTIMES 1' config.h >/dev/null; then
     TLS_ARGS="$TLS_ARGS -l"
 fi
-if egrep '#undef CHOWN_MODIFIES_SYMLINK' "$srcdir/config.h" >/dev/null; then
+if egrep '#undef CHOWN_MODIFIES_SYMLINK' config.h >/dev/null; then
     TLS_ARGS="$TLS_ARGS -L"
 fi
 

diff --git a/testsuite/hardlinks.test b/testsuite/hardlinks.test
index 6de330a..1737b35 100644 (file)
--- 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 7278034..bdb08c2 100644 (file)
--- 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 10b2c88..5914411 100644 (file)
--- 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