diff options
| -rwxr-xr-x | runtests.sh | 4 | ||||
| -rw-r--r-- | testsuite/hardlinks.test | 2 | ||||
| -rw-r--r-- | testsuite/itemize.test | 3 | ||||
| -rw-r--r-- | testsuite/ssh-basic.test | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/runtests.sh b/runtests.sh index 5e54e177..2eb4182d 100755 --- 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 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 |