Change all relevant occurrences of ``rsync'' and ``$rsync_bin'' to the

canonical form ``$RSYNC'' (set in testsuite/rsync.fns). This prevents any
stray rsync binaries in the user's PATH from being picked up by the test
scripts and ensures that the newly built rsync binary is used always.

diff --git a/testsuite/00-hello.test b/testsuite/00-hello.test
index 2aacc28..d7774bb 100644 (file)
--- a/testsuite/00-hello.test
+++ b/testsuite/00-hello.test
@@ -2,4 +2,4 @@
 
 echo $0 running
 
 
 echo $0 running
 

-"$rsync_bin" --version || exit 1
+$RSYNC --version || exit 1

diff --git a/testsuite/chown.test b/testsuite/chown.test
index 9175bc3..2d58b90 100644 (file)
--- a/testsuite/chown.test
+++ b/testsuite/chown.test
@@ -31,7 +31,7 @@ chown 5001 "$name2" || test_skipped "Can't chown (probably need root)"
 chgrp 5002 "$name1" || test_skipped "Can't chgrp (probably need root)"
 chgrp 5003 "$name2" || test_skipped "Can't chgrp (probably need root)"
 
 chgrp 5002 "$name1" || test_skipped "Can't chgrp (probably need root)"
 chgrp 5003 "$name2" || test_skipped "Can't chgrp (probably need root)"
 

-checkit "rsync -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"

 
 exit 0
 # last [] may have failed but if we get here then we've won
 
 exit 0
 # last [] may have failed but if we get here then we've won

diff --git a/testsuite/daemon-gzip-download.test b/testsuite/daemon-gzip-download.test
index bcb3ce1..b716a99 100644 (file)
--- a/testsuite/daemon-gzip-download.test
+++ b/testsuite/daemon-gzip-download.test
@@ -23,9 +23,9 @@
 
 build_rsyncd_conf
 
 
 build_rsyncd_conf
 

-RSYNC_CONNECT_PROG="$rsync_bin --config=$conf --daemon"
+RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"

 export RSYNC_CONNECT_PROG
 
 hands_setup
 export RSYNC_CONNECT_PROG
 
 hands_setup

-checkit "$rsync_bin -avvz localhost::test-from/ \"$TO/\"" "$FROM" "$TO"
+checkit "$RSYNC -avvz localhost::test-from/ \"$TO/\"" "$FROM" "$TO"

 
 

diff --git a/testsuite/daemon-gzip-upload.test b/testsuite/daemon-gzip-upload.test
index 8a3f33f..04642ac 100644 (file)
--- a/testsuite/daemon-gzip-upload.test
+++ b/testsuite/daemon-gzip-upload.test
@@ -17,9 +17,9 @@
 
 build_rsyncd_conf
 
 
 build_rsyncd_conf
 

-RSYNC_CONNECT_PROG="$rsync_bin --config=$conf --daemon"
+RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"

 export RSYNC_CONNECT_PROG
 
 hands_setup
 export RSYNC_CONNECT_PROG
 
 hands_setup

-checkit "$rsync_bin -avvz \"$FROM/\" localhost::test-to/" "$FROM" "$TO"
+checkit "$RSYNC -avvz \"$FROM/\" localhost::test-to/" "$FROM" "$TO"

 
 

diff --git a/testsuite/daemon.test b/testsuite/daemon.test
index 87ebc09..5486505 100644 (file)
--- a/testsuite/daemon.test
+++ b/testsuite/daemon.test
@@ -26,7 +26,7 @@
 
 build_rsyncd_conf
 
 
 build_rsyncd_conf
 

-RSYNC_CONNECT_PROG="$rsync_bin --config=$conf --daemon"
+RSYNC_CONNECT_PROG="$RSYNC --config=$conf --daemon"

 export RSYNC_CONNECT_PROG
 
 export RSYNC_CONNECT_PROG
 

-$rsync_bin -v localhost::
+$RSYNC -v localhost::

diff --git a/testsuite/devices.test b/testsuite/devices.test
index a831e47..21ad10a 100644 (file)
--- a/testsuite/devices.test
+++ b/testsuite/devices.test
@@ -22,7 +22,7 @@ mkdir "$fromdir"
 mknod "$fromdir/char" c 42 69  || test_skipped "Can't create char device node unless root"
 mknod "$fromdir/block" b 42 69 || test_skipped "Can't create block device node unless root"
 
 mknod "$fromdir/char" c 42 69  || test_skipped "Can't create char device node unless root"
 mknod "$fromdir/block" b 42 69 || test_skipped "Can't create block device node unless root"
 

-checkit "rsync -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+checkit "$RSYNC -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"

 
 exit 0
 # last [] may have failed but if we get here then we've won
 
 exit 0
 # last [] may have failed but if we get here then we've won

diff --git a/testsuite/duplicates.test b/testsuite/duplicates.test
index f391d1b..9e47c70 100644 (file)
--- a/testsuite/duplicates.test
+++ b/testsuite/duplicates.test
@@ -38,7 +38,7 @@ ln -s "$name1" "$name2" || fail "can't create symlink"
 
 outfile="$scratchdir/rsync.out"
 
 
 outfile="$scratchdir/rsync.out"
 

-checkit "rsync -avv \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \
+checkit "$RSYNC -avv \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \

     | tee "$outfile"
 
 # Make sure each file was only copied once...
     | tee "$outfile"
 
 # Make sure each file was only copied once...

diff --git a/testsuite/symlink-ignore.test b/testsuite/symlink-ignore.test
index 9c44871..486ca80 100644 (file)
--- a/testsuite/symlink-ignore.test
+++ b/testsuite/symlink-ignore.test
@@ -16,7 +16,7 @@ build_symlinks || test_fail "failed to build symlinks"
 
 # Copy recursively, but without -l or -L or -a, and all the symlinks
 # should be missing.
 
 # Copy recursively, but without -l or -L or -a, and all the symlinks
 # should be missing.

-"$rsync_bin" -r "$fromdir/" "$todir" || test_fail "rsync returned $?"
+$RSYNC -r "$fromdir/" "$todir" || test_fail "$RSYNC returned $?"

 
 [ -f "${todir}/referent" ] || test_fail "referent was not copied"
 [ -d "${todir}/from" ] && test_fail "extra level of directories"
 
 [ -f "${todir}/referent" ] || test_fail "referent was not copied"
 [ -d "${todir}/from" ] && test_fail "extra level of directories"

diff --git a/testsuite/unsafe-links.test b/testsuite/unsafe-links.test
index ea17d5b..7b508bc 100644 (file)
--- a/testsuite/unsafe-links.test
+++ b/testsuite/unsafe-links.test
@@ -35,20 +35,20 @@ ln -s ../../unsafe/unsafefile "from/safe/links/"
 set -x
 
 echo "rsync with relative path and just -a";
 set -x
 
 echo "rsync with relative path and just -a";

-rsync -avv from/safe/ to
+$RSYNC -avv from/safe/ to

 test_symlink to/links/file1
 test_symlink to/links/file2
 test_symlink to/links/unsafefile
 
 echo "rsync with relative path and -a --copy-links"
 test_symlink to/links/file1
 test_symlink to/links/file2
 test_symlink to/links/unsafefile
 
 echo "rsync with relative path and -a --copy-links"

-rsync -avv --copy-links from/safe/ to
+$RSYNC -avv --copy-links from/safe/ to

 test_regular to/links/file1
 test_regular to/links/file2
 test_regular to/links/unsafefile
 
 #next rsync copy correctly
 echo "rsync with relative path and --copy-unsafe-links";
 test_regular to/links/file1
 test_regular to/links/file2
 test_regular to/links/unsafefile
 
 #next rsync copy correctly
 echo "rsync with relative path and --copy-unsafe-links";

-rsync -avv --copy-unsafe-links from/safe/ to
+$RSYNC -avv --copy-unsafe-links from/safe/ to

 test_symlink to/links/file1
 test_symlink to/links/file2
 test_regular to/links/unsafefile
 test_symlink to/links/file1
 test_symlink to/links/file2
 test_regular to/links/unsafefile


@@ -61,7 +61,7 @@ test_skipped "correct behaviour is unclear"
 rm -rf to
 #next rsync copy incorrectly - links are copied as files not as links
 echo "rsync with relative2 path";
 rm -rf to
 #next rsync copy incorrectly - links are copied as files not as links
 echo "rsync with relative2 path";

-(cd from; rsync -avv --copy-unsafe-links safe/ ../to)
+(cd from; $RSYNC -avv --copy-unsafe-links safe/ ../to)

 test_symlink to/links/file1
 test_symlink to/links/file2
 test_regular to/links/unsafefile
 test_symlink to/links/file1
 test_symlink to/links/file2
 test_regular to/links/unsafefile


@@ -69,7 +69,7 @@ test_regular to/links/unsafefile
 rm -rf to
 #next rsync copy uncorectly - all links are copied
 echo "rsync with absolute path";
 rm -rf to
 #next rsync copy uncorectly - all links are copied
 echo "rsync with absolute path";

-rsync -avv --copy-unsafe-links `pwd`/from/safe/ to
+$RSYNC -avv --copy-unsafe-links `pwd`/from/safe/ to

 test_symlink to/links/file1
 test_symlink to/links/file2
 test_regular to/links/unsafefile
 test_symlink to/links/file1
 test_symlink to/links/file2
 test_regular to/links/unsafefile