-"$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"
-
-exit 0 # 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
+
+# The script would have aborted on error, so getting here means we've won.
+exit 0