diff options
| -rw-r--r-- | testsuite/backup.test | 12 | ||||
| -rw-r--r-- | testsuite/chgrp.test | 2 | ||||
| -rw-r--r-- | testsuite/chmod-option.test | 10 | ||||
| -rw-r--r-- | testsuite/compare-dest.test | 8 | ||||
| -rw-r--r-- | testsuite/daemon-gzip-download.test | 2 | ||||
| -rw-r--r-- | testsuite/daemon-gzip-upload.test | 2 | ||||
| -rw-r--r-- | testsuite/delete.test | 3 | ||||
| -rw-r--r-- | testsuite/duplicates.test | 2 | ||||
| -rw-r--r-- | testsuite/exclude.test | 26 | ||||
| -rw-r--r-- | testsuite/fuzzy.test | 2 | ||||
| -rw-r--r-- | testsuite/hardlinks.test | 10 | ||||
| -rw-r--r-- | testsuite/longdir.test | 2 | ||||
| -rw-r--r-- | testsuite/xattrs.test | 2 |
13 files changed, 41 insertions, 42 deletions
diff --git a/testsuite/backup.test b/testsuite/backup.test index 3d026f3f..dc53368c 100644 --- a/testsuite/backup.test +++ b/testsuite/backup.test @@ -20,9 +20,9 @@ outfile="$scratchdir/rsync.out" cat "$srcdir"/[gr]*.[ch] > "$name1" cat "$srcdir"/[et]*.[ch] > "$name2" -checkit "$RSYNC -avv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" +checkit "$RSYNC -avv '$fromdir/' '$todir/'" "$fromdir" "$todir" -checkit "$RSYNC -avv \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir" +checkit "$RSYNC -avv '$fromdir/' '$chkdir/'" "$fromdir" "$chkdir" cat "$srcdir"/[fgpr]*.[ch] > "$name1" cat "$srcdir"/[etw]*.[ch] > "$name2" @@ -39,7 +39,7 @@ echo deleted-file >"$todir/dname" cp -p "$todir/dname" "$chkdir" checkit "$RSYNC -avv --no-whole-file --delete-delay \ - --backup --backup-dir=\"$bakdir\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \ + --backup --backup-dir='$bakdir' '$fromdir/' '$todir/'" "$fromdir" "$todir" \ | tee "$outfile" for fn in deep/name1 deep/name2; do @@ -48,11 +48,11 @@ done diff -r $diffopt "$chkdir" "$bakdir" || test_fail "backup dir contents are bogus" rm "$bakdir/dname" -checkit "$RSYNC -avv --del \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir" +checkit "$RSYNC -avv --del '$fromdir/' '$chkdir/'" "$fromdir" "$chkdir" cat "$srcdir"/[efgr]*.[ch] > "$name1" cat "$srcdir"/[ew]*.[ch] > "$name2" -checkit "$RSYNC -avv --inplace --no-whole-file --backup --backup-dir=\"$bakdir\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \ +checkit "$RSYNC -avv --inplace --no-whole-file --backup --backup-dir='$bakdir' '$fromdir/' '$todir/'" "$fromdir" "$todir" \ | tee "$outfile" for fn in deep/name1 deep/name2; do @@ -60,7 +60,7 @@ for fn in deep/name1 deep/name2; do done diff -r $diffopt "$chkdir" "$bakdir" || test_fail "backup dir contents are bogus" -checkit "$RSYNC -avv --inplace --no-whole-file \"$fromdir/\" \"$bakdir/\"" "$fromdir" "$bakdir" +checkit "$RSYNC -avv --inplace --no-whole-file '$fromdir/' '$bakdir/'" "$fromdir" "$bakdir" # The script would have aborted on error, so getting here means we've won. exit 0 diff --git a/testsuite/chgrp.test b/testsuite/chgrp.test index e65fc0e2..0c1f05c2 100644 --- a/testsuite/chgrp.test +++ b/testsuite/chgrp.test @@ -24,7 +24,7 @@ do done sleep 2 -checkit "$RSYNC -rtgpvvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" +checkit "$RSYNC -rtgpvvv '$fromdir/' '$todir/'" "$fromdir" "$todir" # The script would have aborted on error, so getting here means we've won. exit 0 diff --git a/testsuite/chmod-option.test b/testsuite/chmod-option.test index 3e5fd285..461690e0 100644 --- a/testsuite/chmod-option.test +++ b/testsuite/chmod-option.test @@ -29,23 +29,23 @@ chmod 700 "$dir1" chmod 770 "$dir2" # Copy the files we've created over to another directory -checkit "$RSYNC -avv \"$fromdir/\" \"$checkdir/\"" "$fromdir" "$checkdir" +checkit "$RSYNC -avv '$fromdir/' '$checkdir/'" "$fromdir" "$checkdir" # And then manually make the changes which should occur umask 002 chmod ug-s,a+rX "$checkdir"/* chmod +w "$checkdir" "$checkdir"/dir* -checkit "$RSYNC -avv --chmod ug-s,a+rX,D+w \"$fromdir/\" \"$todir/\"" "$checkdir" "$todir" +checkit "$RSYNC -avv --chmod ug-s,a+rX,D+w '$fromdir/' '$todir/'" "$checkdir" "$todir" rm -r "$fromdir" "$checkdir" "$todir" makepath "$todir" "$fromdir/foo" touch "$fromdir/bar" -checkit "$RSYNC -avv \"$fromdir/\" \"$checkdir/\"" "$fromdir" "$checkdir" +checkit "$RSYNC -avv '$fromdir/' '$checkdir/'" "$fromdir" "$checkdir" chmod o+x "$fromdir"/bar -checkit "$RSYNC -avv --chmod=Fo-x \"$fromdir/\" \"$todir/\"" "$checkdir" "$todir" +checkit "$RSYNC -avv --chmod=Fo-x '$fromdir/' '$todir/'" "$checkdir" "$todir" # Tickle a bug in rsync 2.6.8: if you push a new directory with --perms off to # a daemon with an incoming chmod, the daemon pretends the directory is a file @@ -65,7 +65,7 @@ export RSYNC_CONNECT_PROG rm -r "$todir" makepath "$todir" -checkit "$RSYNC -avv --no-perms \"$fromdir/\" localhost::test-incoming-chmod/" "$checkdir" "$todir" +checkit "$RSYNC -avv --no-perms '$fromdir/' localhost::test-incoming-chmod/" "$checkdir" "$todir" # The script would have aborted on error, so getting here means we've won. exit 0 diff --git a/testsuite/compare-dest.test b/testsuite/compare-dest.test index 4ce21d0c..d9eea8e9 100644 --- a/testsuite/compare-dest.test +++ b/testsuite/compare-dest.test @@ -27,11 +27,11 @@ $RSYNC -av --exclude=/text --exclude=etc-ltr-list "$fromdir/" "$chkdir/" # Let's do it! checkit "$RSYNC -avv --no-whole-file \ - --compare-dest=\"$alt1dir\" --compare-dest=\"$alt2dir\" \ - \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" + --compare-dest='$alt1dir' --compare-dest='$alt2dir' \ + '$fromdir/' '$todir/'" "$chkdir" "$todir" checkit "$RSYNC -avv --no-whole-file \ - --copy-dest=\"$alt1dir\" --copy-dest=\"$alt2dir\" \ - \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" + --copy-dest='$alt1dir' --copy-dest='$alt2dir' \ + '$fromdir/' '$todir/'" "$fromdir" "$todir" # The script would have aborted on error, so getting here means we've won. exit 0 diff --git a/testsuite/daemon-gzip-download.test b/testsuite/daemon-gzip-download.test index 383d8970..89a112ff 100644 --- a/testsuite/daemon-gzip-download.test +++ b/testsuite/daemon-gzip-download.test @@ -31,7 +31,7 @@ hands_setup # Build chkdir with a normal rsync and an --exclude. $RSYNC -av --exclude=foobar.baz "$fromdir/" "$chkdir/" -checkit "$RSYNC -avvvvz localhost::test-from/ \"$todir/\"" "$chkdir" "$todir" +checkit "$RSYNC -avvvvz localhost::test-from/ '$todir/'" "$chkdir" "$todir" # The script would have aborted on error, so getting here means we've won. exit 0 diff --git a/testsuite/daemon-gzip-upload.test b/testsuite/daemon-gzip-upload.test index 49a7b1ae..d290228d 100644 --- a/testsuite/daemon-gzip-upload.test +++ b/testsuite/daemon-gzip-upload.test @@ -25,7 +25,7 @@ hands_setup # Build chkdir with a normal rsync and an --exclude. $RSYNC -av --exclude=foobar.baz "$fromdir/" "$chkdir/" -checkit "$RSYNC -avvvvz \"$fromdir/\" localhost::test-to/" "$chkdir" "$todir" +checkit "$RSYNC -avvvvz '$fromdir/' localhost::test-to/" "$chkdir" "$todir" # The script would have aborted on error, so getting here means we've won. exit 0 diff --git a/testsuite/delete.test b/testsuite/delete.test index fae8fe26..8fa6035a 100644 --- a/testsuite/delete.test +++ b/testsuite/delete.test @@ -35,8 +35,7 @@ diff $diffopt "$tmpdir/copy.out" "$tmpdir/copy2.out" $RSYNC -av -f 'exclude,! */' "$fromdir/" "$chkdir/empty/" -checkit "$RSYNC -avv --del --remove-source-files \ - \"$fromdir/\" \"$todir/\"" "$chkdir/copy" "$todir" +checkit "$RSYNC -avv --del --remove-source-files '$fromdir/' '$todir/'" "$chkdir/copy" "$todir" diff -r "$chkdir/empty" "$fromdir" diff --git a/testsuite/duplicates.test b/testsuite/duplicates.test index 0459416f..3b4ebab0 100644 --- a/testsuite/duplicates.test +++ b/testsuite/duplicates.test @@ -31,7 +31,7 @@ ln -s "$name1" "$name2" || fail "can't create symlink" outfile="$scratchdir/rsync.out" -checkit "$RSYNC -avv \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \ +checkit "$RSYNC -avv '$fromdir/' '$fromdir/' '$fromdir/' '$fromdir/' '$fromdir/' '$fromdir/' '$fromdir/' '$fromdir/' '$fromdir/' '$fromdir/' '$todir/'" "$fromdir" "$todir" \ | tee "$outfile" # Make sure each file was only copied once... diff --git a/testsuite/exclude.test b/testsuite/exclude.test index 33168dd6..2fef0922 100644 --- a/testsuite/exclude.test +++ b/testsuite/exclude.test @@ -107,14 +107,14 @@ EOF # Start with a check of --prune-empty-dirs: $RSYNC -av -f -_foo/too/ -f -_foo/down/ -f -_foo/and/ -f -_new/ "$fromdir/" "$chkdir/" -checkit "$RSYNC -av --prune-empty-dirs \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" +checkit "$RSYNC -av --prune-empty-dirs '$fromdir/' '$todir/'" "$chkdir" "$todir" rm -rf "$todir" # Add a directory symlink. ln -s too "$fromdir/bar/down/to/foo/sym" # Create chkdir with what we expect to be excluded. -checkit "$RSYNC -avv \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir" +checkit "$RSYNC -avv '$fromdir/' '$chkdir/'" "$fromdir" "$chkdir" sleep 1 # Ensures that the rm commands will tweak the directory times. rm -r "$chkdir"/foo/down rm -r "$chkdir"/mid/for/foo/and @@ -130,8 +130,8 @@ $RSYNC -av --existing --include='*/' --exclude='*' "$fromdir/" "$chkdir/" # Now, test if rsync excludes the same files. -checkit "$RSYNC -avv --exclude-from=\"$excl\" \ - --delete-during \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" +checkit "$RSYNC -avv --exclude-from='$excl' \ + --delete-during '$fromdir/' '$todir/'" "$chkdir" "$todir" # Modify the chk dir by removing cvs-ignored files and then tweaking the dir times. @@ -146,8 +146,8 @@ $RSYNC -av --existing --filter='exclude,! */' "$fromdir/" "$chkdir/" # Now, test if rsync excludes the same files, this time with --cvs-exclude # and --delete-excluded. -checkit "$RSYNC -avvC --filter=\"merge $excl\" --delete-excluded \ - --delete-during \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" +checkit "$RSYNC -avvC --filter='merge $excl' --delete-excluded \ + --delete-during '$fromdir/' '$todir/'" "$chkdir" "$todir" # Modify the chk dir for our merge-exclude test and then tweak the dir times. @@ -166,9 +166,9 @@ $RSYNC -av --existing --filter='-! */' "$fromdir/" "$chkdir/" # Now, test if rsync excludes the same files, this time with a merge-exclude # file. -checkit "sed '/!/d' \"$excl\" | +checkit "sed '/!/d' '$excl' | $RSYNC -avv -f dir-merge_.filt -f merge_- \ - --delete-during \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" + --delete-during '$fromdir/' '$todir/'" "$chkdir" "$todir" # Remove the files that will be deleted. @@ -184,9 +184,9 @@ $RSYNC -av --protocol=28 --existing --include='*/' --exclude='*' "$fromdir/" "$c # Now, try the prior command with --delete-before and some side-specific # rules. -checkit "sed '/!/d' \"$excl\" | +checkit "sed '/!/d' '$excl' | $RSYNC -avv -f :s_.filt -f .s_- -f P_nodel.deep \ - --delete-before \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" + --delete-before '$fromdir/' '$todir/'" "$chkdir" "$todir" # Next, we'll test some rule-restricted filter files. @@ -205,15 +205,15 @@ $RSYNC -av --existing --filter='-! */' "$fromdir/" "$chkdir/" $RSYNC -av --delete-excluded --exclude='*' "$fromdir/" "$todir/" checkit "$RSYNC -avv -f dir-merge,-_.excl \ - \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir" + '$fromdir/' '$todir/'" "$chkdir" "$todir" relative_opts='--relative --chmod=Du+w --copy-unsafe-links' $RSYNC -av $relative_opts "$fromdir/foo" "$chkdir/" rm -rf "$chkdir$fromdir/foo/down" $RSYNC -av $relative_opts --existing --filter='-! */' "$fromdir/foo" "$chkdir/" -checkit "$RSYNC -avv $relative_opts --exclude=\"$fromdir/foo/down\" \ - \"$fromdir/foo\" \"$todir\"" "$chkdir$fromdir/foo" "$todir$fromdir/foo" +checkit "$RSYNC -avv $relative_opts --exclude='$fromdir/foo/down' \ + '$fromdir/foo' '$todir'" "$chkdir$fromdir/foo" "$todir$fromdir/foo" # The script would have aborted on error, so getting here means we've won. exit 0 diff --git a/testsuite/fuzzy.test b/testsuite/fuzzy.test index 1f389171..0041629f 100644 --- a/testsuite/fuzzy.test +++ b/testsuite/fuzzy.test @@ -18,7 +18,7 @@ sleep 1 # Let's do it! checkit "$RSYNC -avvi --no-whole-file --fuzzy --delete-delay \ - \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" + '$fromdir/' '$todir/'" "$fromdir" "$todir" # The script would have aborted on error, so getting here means we've won. exit 0 diff --git a/testsuite/hardlinks.test b/testsuite/hardlinks.test index 37e7517e..c9a4d72d 100644 --- a/testsuite/hardlinks.test +++ b/testsuite/hardlinks.test @@ -29,11 +29,11 @@ ln "$name2" "$name3" || fail "Can't create hardlink" cp "$name2" "$name4" || fail "Can't copy file" cat $srcdir/*.c >"$fromdir/text" -checkit "$RSYNC -aHivv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" +checkit "$RSYNC -aHivv '$fromdir/' '$todir/'" "$fromdir" "$todir" echo "extra extra" >>"$todir/name1" -checkit "$RSYNC -aHivv --no-whole-file \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" +checkit "$RSYNC -aHivv --no-whole-file '$fromdir/' '$todir/'" "$fromdir" "$todir" # Add a new link in a new subdirectory to test that we don't try to link # the files before the directory gets created. @@ -41,14 +41,14 @@ mkdir "$fromdir/subdir" ln "$name1" "$fromdir/subdir/new-file" rm "$todir/text" -checkit "$RSYNC -aHivv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" +checkit "$RSYNC -aHivv '$fromdir/' '$todir/'" "$fromdir" "$todir" # Do some duplicate copies using --link-dest and --copy-dest to test that # we hard-link all locally-inherited items. -checkit "$RSYNC -aHivv --link-dest=\"$todir\" \"$fromdir/\" \"$chkdir/\"" "$todir" "$chkdir" +checkit "$RSYNC -aHivv --link-dest='$todir' '$fromdir/' '$chkdir/'" "$todir" "$chkdir" rm -rf "$chkdir" -checkit "$RSYNC -aHivv --copy-dest=\"$todir\" \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir" +checkit "$RSYNC -aHivv --copy-dest='$todir' '$fromdir/' '$chkdir/'" "$fromdir" "$chkdir" # Make sure there's nothing wrong with sending a single file with -H # enabled (this has broken twice so far, so we need this test). diff --git a/testsuite/longdir.test b/testsuite/longdir.test index a3aff9a9..8d66bb5f 100644 --- a/testsuite/longdir.test +++ b/testsuite/longdir.test @@ -20,7 +20,7 @@ if [ -r /etc ]; then else ls -la / >"$longdir/2" fi -checkit "$RSYNC --delete -avH \"$fromdir/\" \"$todir\"" "$fromdir/" "$todir" +checkit "$RSYNC --delete -avH '$fromdir/' '$todir'" "$fromdir/" "$todir" # The script would have aborted on error, so getting here means we've won. exit 0 diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test index 4b98de85..ab022cdf 100644 --- a/testsuite/xattrs.test +++ b/testsuite/xattrs.test @@ -75,7 +75,7 @@ xset user.equal 'this long attribute should remain the same and not need to be t xls $files >"$scratchdir/xattrs.txt" # OK, let's try a simple xattr copy. -checkit "$RSYNC -avX . \"$chkdir/\"" "$fromdir" "$chkdir" +checkit "$RSYNC -avX . '$chkdir/'" "$fromdir" "$chkdir" cd "$chkdir" xls $files | diff $diffopt "$scratchdir/xattrs.txt" - |