[PATCH] make test patch.

[Geoffrey Lee]

Yo,



Currently if you build rsync and you don't have rsync installed, make
test will fail because some tests reference the rsync binary directly
(instead of using the $RSYNC variable).

I cannot find anything which refers to this problem in the mail archives
or CVS logs.

Below is a patch which fixes this problem.

(please CC: me, I'm not subscribed. Thanks.)


	-- Geoff.

-------------- next part --------------
diff -urNp rsync-2.5.5.orig/testsuite/chgrp.test rsync-2.5.5/testsuite/chgrp.test
--- rsync-2.5.5.orig/testsuite/chgrp.test	2002-03-25 04:01:37.000000000 +0100
+++ rsync-2.5.5/testsuite/chgrp.test	2002-06-16 06:19:50.000000000 +0200
@@ -31,7 +31,7 @@ do
 done
 sleep 2
 
-checkit "rsync -rtgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+checkit "$RSYNC -rtgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
 
 exit 0
 # last [] may have failed but if we get here then we've won
diff -urNp rsync-2.5.5.orig/testsuite/devices.test rsync-2.5.5/testsuite/devices.test
--- rsync-2.5.5.orig/testsuite/devices.test	2002-03-22 07:09:09.000000000 +0100
+++ rsync-2.5.5/testsuite/devices.test	2002-06-15 07:47:00.000000000 +0200
@@ -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"
 
-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
diff -urNp rsync-2.5.5.orig/testsuite/duplicates.test rsync-2.5.5/testsuite/duplicates.test
--- rsync-2.5.5.orig/testsuite/duplicates.test	2002-03-22 07:07:50.000000000 +0100
+++ rsync-2.5.5/testsuite/duplicates.test	2002-06-15 07:47:18.000000000 +0200
@@ -38,7 +38,7 @@ ln -s "$name1" "$name2" || fail "can't c
 
 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...
diff -urNp rsync-2.5.5.orig/testsuite/hardlinks.test rsync-2.5.5/testsuite/hardlinks.test
--- rsync-2.5.5.orig/testsuite/hardlinks.test	2002-01-11 08:11:24.000000000 +0100
+++ rsync-2.5.5/testsuite/hardlinks.test	2002-06-15 07:47:38.000000000 +0200
@@ -31,7 +31,7 @@ ln "$name1" "$name2" || fail "Can't crea
 ln "$name2" "$name3" || fail "Can't create hardlink"
 cp "$name2" "$name4" || fail "Can't copy file"
 
-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