X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/fdfc3dc9f3e501a9b612af9ed871b621bb386984..7918f2440534993bdda324da839b2ea9a3884757:/testsuite/symlink-ignore.test

diff --git a/testsuite/symlink-ignore.test b/testsuite/symlink-ignore.test
index 5cfd3e92..eec7a301 100644
--- a/testsuite/symlink-ignore.test
+++ b/testsuite/symlink-ignore.test
@@ -8,22 +8,30 @@
 # Test rsync's somewhat over-featured symlink control: the default
 # behaviour is that symlinks should not be copied at all.
 
-. $srcdir/testsuite/rsync.fns
-
-set -x
+. "$suitedir/rsync.fns"
 
 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 $?"
+$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"
-[ -L "$todir/dangling" ] && test_fail "dangling symlink was copied"
-[ -L "$todir/relative" ] && test_fail "relative symlink was copied" 
-[ -L "$todir/absolute" ] && test_fail "absolute symlink was copied"
-
+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
+
+# The script would have aborted on error, so getting here means we've won.
 exit 0
-# last [] may have failed but if we get here then we've one
-