PATCH: Fix IRIX 6 testsuite failures

[Rainer Orth]

Having built rsync 2.5.5 on IRIX 6.2 with gcc 3.1, I ran into two failures
when running the testsuite with make check: both the chgrp and hardlinks
tests fail:

The failure in the chgrp test occurs here:

+ rsync -rtgvvv /amnt/callisto/volumes/obj-irix5/local/obj.irix5/rsync-2.5.5/testtmp.chgrp/from/ /amnt/callisto/volumes/obj-irix5/local/obj.irix5/rsync-2.5.5/testtmp.chgrp/to/ 
rsync: opendir /amnt/callisto/volumes/obj-irix5/local/obj.irix5/rsync-2.5.5/testtmp.chgrp/from//tgvvv failed: No such file or directory.
rsync: /amnt/callisto/volumes/obj-irix5/local/obj.irix5/rsync-2.5.5/testtmp.chgrp/to/: No such file or directory.

For the hardlinks test, the failure is similar:

+ rsync -aHvv /amnt/callisto/volumes/obj-irix5/local/obj.irix5/rsync-2.5.5/testtmp.hardlinks/from/ /amnt/callisto/volumes/obj-irix5/local/obj.irix5/rsync-2.5.5/testtmp.hardlinks/to/ 
rsync: ERROR: Illegal option -- a
usage: rsync [-c command] [-r rcsdir] [-Rv] [dirname ...]

It turned out that this happens because those tests and some others that
are skipped when running as non-root don't specify the path for the rsync
to test, and IRIX 6 has a completely unrelated rsync command in /usr/sbin.

The following trivial patch fixes this and allows the two tests above to
succeed.

	Rainer


Thu Aug 29 16:52:29 2002  Rainer Orth  <ro at TechFak.Uni-Bielefeld.DE>

	* testsuite/chgrp.test: Use $rsync_bin instead of plain rsync.
	* testsuite/chown.test: Likewise.
	* testsuite/devices.test: Likewise.
	* testsuite/duplicates.test: Likewise.
	* testsuite/hardlinks.test: Likewise.

===================================================================
RCS file: testsuite/RCS/chgrp.test,v
retrieving revision 1.1
diff -up -r1.1 testsuite/chgrp.test
--- testsuite/chgrp.test	2002/03/25 03:01:37	1.1
+++ testsuite/chgrp.test	2002/08/29 17:11:14
@@ -31,7 +31,7 @@ do
 done
 sleep 2
 
-checkit "rsync -rtgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
+checkit "$rsync_bin -rtgvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
 
 exit 0
 # last [] may have failed but if we get here then we've won
===================================================================
RCS file: testsuite/RCS/chown.test,v
retrieving revision 1.1
diff -up -r1.1 testsuite/chown.test
--- testsuite/chown.test	2002/03/22 06:07:50	1.1
+++ testsuite/chown.test	2002/08/29 17:11:24
@@ -31,7 +31,7 @@ chown 5001 "$name2" || test_skipped "Can
 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_bin -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
 
 exit 0
 # last [] may have failed but if we get here then we've won
===================================================================
RCS file: testsuite/RCS/devices.test,v
retrieving revision 1.1
diff -up -r1.1 testsuite/devices.test
--- testsuite/devices.test	2002/03/22 06:09:09	1.1
+++ testsuite/devices.test	2002/08/29 17:11:33
@@ -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_bin -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
 
 exit 0
 # last [] may have failed but if we get here then we've won
===================================================================
RCS file: testsuite/RCS/duplicates.test,v
retrieving revision 1.1
diff -up -r1.1 testsuite/duplicates.test
--- testsuite/duplicates.test	2002/03/22 06:07:50	1.1
+++ testsuite/duplicates.test	2002/08/29 17:11:44
@@ -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_bin -avv \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \
     | tee "$outfile"
 
 # Make sure each file was only copied once...
===================================================================
RCS file: testsuite/RCS/hardlinks.test,v
retrieving revision 1.1
diff -up -r1.1 testsuite/hardlinks.test
--- testsuite/hardlinks.test	2002/01/11 07:11:24	1.1
+++ testsuite/hardlinks.test	2002/08/29 17:11:53
@@ -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_bin -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
 
 exit 0
 # last [] may have failed but if we get here then we've won