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

[rsync/rsync.git] / testsuite / symlink-ignore.test

diff --git a/testsuite/symlink-ignore.test b/testsuite/symlink-ignore.test
index e7ef371..486ca80 100644 (file)
--- a/testsuite/symlink-ignore.test
+++ b/testsuite/symlink-ignore.test
@@ -10,17 +10,31 @@
 
 . $srcdir/testsuite/rsync.fns
 
-build_symlinks
+set -x
+
+build_symlinks || test_fail "failed to build symlinks"
 
 # 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 $?"
-
-[ -e $todir/referent ] || test_fail "referent was not copied"
-[ -e $todir/from ] && test_fail "extra level of directories"
-[ -e $todir/dangling ] && test_fail "dangling symlink was copied"
-[ -e $todir/relative ] && test_fail "relative symlink was copied"
-[ -e $todir/absolute ] && test_fail "absolute symlink was copied"
-
-true # last [] may have failed but if we get here then we've one
+$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"
+if is_a_link "${todir}/dangling" 
+then 
+    test_fail "dangling symlink was copied"
+fi
+
+if is_a_link "${todir}/relative" 
+then
+    test_fail "relative symlink was copied" 
+fi
+
+if is_a_link "${todir}/absolute" 
+then
+    test_fail "absolute symlink was copied"
+fi
+
+exit 0
+# last [] may have failed but if we get here then we've one