Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added safe_fname() that converts any newlines in a name into '?'s.
[rsync/rsync.git]
/
testsuite
/
compare-dest.test
diff --git
a/testsuite/compare-dest.test
b/testsuite/compare-dest.test
index
28dbda1
..
66be4c3
100644
(file)
--- a/
testsuite/compare-dest.test
+++ b/
testsuite/compare-dest.test
@@
-1,14
+1,11
@@
#! /bin/sh
#! /bin/sh
-# Copyright (C) 200
3
by Wayne Davison <wayned@samba.org>
+# Copyright (C) 200
4
by Wayne Davison <wayned@samba.org>
# This program is distributable under the terms of the GNU GPL see
# COPYING).
# This program is distributable under the terms of the GNU GPL see
# COPYING).
-# Test rsync handling of exclude/include directives.
-
-# Test some of the more obscure wildcard handling of exclude/include
-# processing.
+# Test rsync handling of the --compare-dest option.
. "$suitedir/rsync.fns"
. "$suitedir/rsync.fns"
@@
-20,11
+17,17
@@
altdir="$tmpdir/alt"
hands_setup
hands_setup
-# Setup the chk and alt dirs
-$RSYNC -av --exclude=text "$fromdir/" "$chkdir/"
+# Setup the alt and chk dirs
$RSYNC -av --include=text --include='*/' --exclude='*' "$fromdir/" "$altdir/"
$RSYNC -av --include=text --include='*/' --exclude='*' "$fromdir/" "$altdir/"
-checkit "$RSYNC -avv --compare-dest=\"$altdir\" \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+sleep 1
+touch "$fromdir/dir/text"
+
+$RSYNC -av --exclude=/text "$fromdir/" "$chkdir/"
+
+# Let's do it!
+checkit "$RSYNC -avv --no-whole-file --compare-dest=\"$altdir\" \
+ \"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
# The script would have aborted on error, so getting here means we've won.
exit 0
# The script would have aborted on error, so getting here means we've won.
exit 0