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
- Put directory retouching code into a separate function that
[rsync/rsync.git]
/
testsuite
/
compare-dest.test
diff --git
a/testsuite/compare-dest.test
b/testsuite/compare-dest.test
index
1ddbf78
..
4ce21d0
100644
(file)
--- a/
testsuite/compare-dest.test
+++ b/
testsuite/compare-dest.test
@@
-1,36
+1,37
@@
#! /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
+# This program is distributable under the terms of the GNU GPL
(
see
# COPYING).
# 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"
-set -x
-
-altdir="$tmpdir/alt"
+alt1dir="$tmpdir/alt1"
+alt2dir="$tmpdir/alt2"
# Build some files/dirs/links to copy
hands_setup
# Setup the alt and chk dirs
# Build some files/dirs/links to copy
hands_setup
# Setup the alt and chk dirs
-$RSYNC -av --include=text --include='*/' --exclude='*' "$fromdir/" "$altdir/"
+$RSYNC -av --include=text --include='*/' --exclude='*' "$fromdir/" "$alt1dir/"
+$RSYNC -av --include=etc-ltr-list --include='*/' --exclude='*' "$fromdir/" "$alt2dir/"
sleep 1
touch "$fromdir/dir/text"
sleep 1
touch "$fromdir/dir/text"
-$RSYNC -av --exclude=/text "$fromdir/" "$chkdir/"
+$RSYNC -av --exclude=/text
--exclude=etc-ltr-list
"$fromdir/" "$chkdir/"
# Let's do it!
# Let's do it!
-checkit "$RSYNC -avv --no-whole-file --compare-dest=\"$altdir\" \
+checkit "$RSYNC -avv --no-whole-file \
+ --compare-dest=\"$alt1dir\" --compare-dest=\"$alt2dir\" \
\"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
\"$fromdir/\" \"$todir/\"" "$chkdir" "$todir"
+checkit "$RSYNC -avv --no-whole-file \
+ --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
# The script would have aborted on error, so getting here means we've won.
exit 0