Try to handle 'test -L' on Sun.

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 41f3354..f9660d6 100644 (file)
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -241,5 +241,10 @@ test_xfail() {
     exit 78
 }
 
+# Test whether something is a link, allowing for shell peculiarities
+is_a_link() {
+    test -L "$1" || test -h "$1" || /usr/bin/test -L "$1" || /usr/bin/test -h "$1"
+}
+
 # be reproducible
 umask 077
\ No newline at end of file

diff --git a/testsuite/symlink-ignore.test b/testsuite/symlink-ignore.test
index 7bff041..9c44871 100644 (file)
--- a/testsuite/symlink-ignore.test
+++ b/testsuite/symlink-ignore.test
@@ -20,17 +20,17 @@ build_symlinks || test_fail "failed to build symlinks"
 
 [ -f "${todir}/referent" ] || test_fail "referent was not copied"
 [ -d "${todir}/from" ] && test_fail "extra level of directories"
-if [ -L "${todir}/dangling" ] 
+if is_a_link "${todir}/dangling" 
 then 
     test_fail "dangling symlink was copied"
 fi
 
-if [ -L "${todir}/relative" ] 
+if is_a_link "${todir}/relative" 
 then
     test_fail "relative symlink was copied" 
 fi
 
-if [ -L "${todir}/absolute" ]
+if is_a_link "${todir}/absolute" 
 then
     test_fail "absolute symlink was copied"
 fi