X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/814b340c2702aedd204be64f18e41aef6c684cec..48ffc11e9cd35d57f518a5cac8e56d79d424ca04:/testsuite/delete.test diff --git a/testsuite/delete.test b/testsuite/delete.test index 00e3614f..bab92a12 100644 --- a/testsuite/delete.test +++ b/testsuite/delete.test @@ -12,13 +12,20 @@ hands_setup makepath "$chkdir" +makepath "$todir/extradir" +makepath "$todir/emptydir/subdir" + +echo extra >"$todir"/remove1 +echo extra >"$todir"/remove2 +echo extra >"$todir"/extradir/remove3 +echo extra >"$todir"/emptydir/subdir/remove4 # Create two chk dirs, one with a copy of the source files, and one with -# what we expect to be left behind by the copy using --remove-sent-files. +# what we expect to be left behind by the copy using --remove-source-files. $RSYNC -av "$fromdir/" "$chkdir/copy/" $RSYNC -av -f 'exclude,! */' "$fromdir/" "$chkdir/empty/" -checkit "$RSYNC -avv --remove-sent-files \ +checkit "$RSYNC -avv --del --remove-source-files \ \"$fromdir/\" \"$todir/\"" "$chkdir/copy" "$todir" diff -r "$chkdir/empty" "$fromdir" @@ -33,9 +40,9 @@ touch "$todir/foo" "$todir/bar" "$todir/baz" $RSYNC -r --exclude=baz --filter=': filters' --delete-excluded "$fromdir/" "$todir/" -test -f "$todir/foo" || test_fail "rsync deleted $todir/foo" -test -f "$todir/bar" && test_fail "rsync did not delete $todir/bar" -test -f "$todir/baz" && test_fail "rsync did not delete $todir/baz" +test -f "$todir/foo" || test_fail "rsync should NOT have deleted $todir/foo" +test -f "$todir/bar" && test_fail "rsync SHOULD have deleted $todir/bar" +test -f "$todir/baz" && test_fail "rsync SHOULD have deleted $todir/baz" # The script would have aborted on error, so getting here means we've won. exit 0