X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/952ae751384aebf39e36cb0fb8d7d894dccc901d..b769ad6a3e7ef871ea0aabd5b033018ba6cdbb90:/testsuite/delete.test diff --git a/testsuite/delete.test b/testsuite/delete.test index 077a59d8..8fa6035a 100644 --- a/testsuite/delete.test +++ b/testsuite/delete.test @@ -23,20 +23,19 @@ echo extra >"$todir"/emptydir/subdir/remove4 # Also, make sure that --dry-run --del doesn't output anything extraneous. $RSYNC -av "$fromdir/" "$chkdir/copy/" >"$tmpdir/copy.out" 2>&1 cat "$tmpdir/copy.out" -grep -v '^\(created directory\|sent\|total size\) ' "$tmpdir/copy.out" >"$tmpdir/copy.new" +egrep -v '^(created directory|sent|total size) ' "$tmpdir/copy.out" >"$tmpdir/copy.new" mv "$tmpdir/copy.new" "$tmpdir/copy.out" $RSYNC -avn --del "$fromdir/" "$chkdir/copy2/" >"$tmpdir/copy2.out" 2>&1 || true cat "$tmpdir/copy2.out" -grep -v '^\(created directory\|sent\|total size\) ' "$tmpdir/copy2.out" >"$tmpdir/copy2.new" +egrep -v '^(created directory|sent|total size) ' "$tmpdir/copy2.out" >"$tmpdir/copy2.new" mv "$tmpdir/copy2.new" "$tmpdir/copy2.out" 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"