Test more permutations.

1 files changed, 25 insertions, 12 deletions

diff --git a/testsuite/unsafe-links.test b/testsuite/unsafe-links.test
index edf4b5fa..faaa6b28 100644
--- a/testsuite/unsafe-links.test
+++ b/testsuite/unsafe-links.test
@@ -14,12 +14,6 @@ test_regular() {
 	fi;
 };
 
-test_copy() {
-	test_symlink to/links/file1
-	test_symlink to/links/file2
-	test_regular to/links/unsafefile
-}
-
 cd "$TMP"
 
 mkdir from
@@ -38,21 +32,40 @@ ln -s ../files/file1 "from/safe/links/"
 ln -s ../files/file2 "from/safe/links/"
 ln -s ../../unsafe/unsafefile "from/safe/links/"
 
-#next rsync copy correctly
 set -x
-echo "rsync with relative path";
+
+echo "rsync with relative path and just -a";
+rsync -avv from/safe/ to
+test_symlink to/links/file1
+test_symlink to/links/file2
+test_symlink to/links/unsafefile
+
+echo "rsync with relative path and -a --copy-links"
+rsync -avv --copy-links from/safe/ to
+test_regular to/links/file1
+test_regular to/links/file2
+test_regular to/links/unsafefile
+
+#next rsync copy correctly
+echo "rsync with relative path and --copy-unsafe-links";
 rsync -avv --copy-unsafe-links from/safe/ to
-test_copy;
+test_symlink to/links/file1
+test_symlink to/links/file2
+test_regular to/links/unsafefile
 
 rm -rf to
-#next rsync copy uncorectly - links are copied as files not as links
+#next rsync copy incorrectly - links are copied as files not as links
 echo "rsync with relative2 path";
 (cd from; rsync -avv --copy-unsafe-links safe/ ../to)
-test_copy;
+test_symlink to/links/file1
+test_symlink to/links/file2
+test_regular to/links/unsafefile
 
 rm -rf to
 #next rsync copy uncorectly - all links are copied
 echo "rsync with absolute path";
 rsync -avv --copy-unsafe-links `pwd`/from/safe/ to
-test_copy;
+test_symlink to/links/file1
+test_symlink to/links/file2
+test_regular to/links/unsafefile