Proper messages for skipped tests.

diff --git a/testsuite/chown.test b/testsuite/chown.test
index 751edbe..9175bc3 100644 (file)
--- a/testsuite/chown.test
+++ b/testsuite/chown.test
@@ -26,10 +26,10 @@ name2="$fromdir/name2"
 echo "This is the file" > "$name1"
 echo "This is the other file" > "$name2"
 
-chown 5000 "$name1" || test_skipped "Can't chown"
-chown 5001 "$name2" || test_skipped "Can't chown"
-chgrp 5002 "$name1" || test_skipped "Can't chgrp"
-chgrp 5003 "$name2" || test_skipped "Can't chgrp"
+chown 5000 "$name1" || test_skipped "Can't chown (probably need root)"
+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)"
 
 checkit "rsync -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir"
 

diff --git a/testsuite/duplicates.test b/testsuite/duplicates.test
index 6bbcdd3..f391d1b 100644 (file)
--- a/testsuite/duplicates.test
+++ b/testsuite/duplicates.test
@@ -21,8 +21,7 @@
 
 . $srcdir/testsuite/rsync.fns
 
-echo "SKIP THIS FOR NOW; It's a known bug"
-exit 77
+test_skipped "Known minor bug in this code"
 
 set -x
 

diff --git a/testsuite/ssh-basic.test b/testsuite/ssh-basic.test
index c24ac3e..caf880f 100644 (file)
--- a/testsuite/ssh-basic.test
+++ b/testsuite/ssh-basic.test
@@ -12,18 +12,15 @@
 
 if [ "x$rsync_enable_ssh_tests" != xyes ]
 then
-    echo "Skipping SSH tests because \$rsync_enable_ssh_tests is not set"
-    exit 77
+    test_skipped "Skipping SSH tests because \$rsync_enable_ssh_tests is not set"
 fi
 
 if ! type ssh >/dev/null ; then
-    echo "Skipping SSH tests because ssh is not in the path"
-    exit 77
+    test_skipped "Skipping SSH tests because ssh is not in the path"
 fi
 
 if ! [ "`ssh -o'BatchMode yes' localhost echo yes`" = "yes" ]; then
-    echo "Skipping SSH tests because ssh conection to localhost not authorised"
-    exit 77
+    test_skipped "Skipping SSH tests because ssh conection to localhost not authorised"
 fi
 
 runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}'