Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0758b2d
)
Added a test to make sure that merging relative items continues to
author
Wayne Davison
<wayned@samba.org>
Sun, 23 Sep 2007 00:30:40 +0000
(
00:30
+0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 23 Sep 2007 00:30:40 +0000
(
00:30
+0000)
work right.
testsuite/relative.test
patch
|
blob
|
blame
|
history
diff --git
a/testsuite/relative.test
b/testsuite/relative.test
index
8ff20df
..
2fa6687
100644
(file)
--- a/
testsuite/relative.test
+++ b/
testsuite/relative.test
@@
-8,32
+8,51
@@
deepstr='down/3/deep'
deepdir="$fromdir/$deepstr"
deepstr='down/3/deep'
deepdir="$fromdir/$deepstr"
-makepath "$deepdir"
+extradir="$fromdir/extra"
+makepath "$deepdir" "$extradir/$deepstr" "$chkdir"
+
fromdir="$deepdir"
hands_setup
fromdir="$tmpdir/from"
fromdir="$deepdir"
hands_setup
fromdir="$tmpdir/from"
+extrafile="$extradir/./$deepstr/extra.added.value"
+echo wowza >"$extrafile"
+
outfile="$scratchdir/rsync.out"
cd "$fromdir"
# Main script starts here
outfile="$scratchdir/rsync.out"
cd "$fromdir"
# Main script starts here
+$RSYNC -ai --include=/down/ --exclude='/*' "$fromdir/" "$chkdir/"
+
sleep 1
sleep 1
-runtest "basic relative" 'checkit "$RSYNC -avR ./$deepstr \"$todir\"" "$
fromdir/
" "$todir"'
+runtest "basic relative" 'checkit "$RSYNC -avR ./$deepstr \"$todir\"" "$
chkdir
" "$todir"'
-ln "$deepdir/filelist" "$deepdir/dir"
-runtest "hard links" 'checkit "$RSYNC -avHR ./$deepstr/ \"$todir\"" "$fromdir/" "$todir"'
+ln $deepstr/filelist $deepstr/dir
+ln ../chk/$deepstr/filelist ../chk/$deepstr/dir
+runtest "hard links" 'checkit "$RSYNC -avHR ./$deepstr/ \"$todir\"" "$chkdir" "$todir"'
cp "$deepdir/text" "$todir/$deepstr/ThisShouldGo"
cp "$deepdir/text" "$todir/$deepstr/dir/ThisShouldGoToo"
cp "$deepdir/text" "$todir/$deepstr/ThisShouldGo"
cp "$deepdir/text" "$todir/$deepstr/dir/ThisShouldGoToo"
-runtest "deletion" 'checkit "$RSYNC -avHR --del
ete ./$deepstr/ \"$todir\"" "$fromdir/
" "$todir"'
+runtest "deletion" 'checkit "$RSYNC -avHR --del
./$deepstr/ \"$todir\"" "$chkdir
" "$todir"'
-runtest "non-deletion" 'checkit "$RSYNC -aiHR --del
ete ./$deepstr/ \"$todir\"" "$fromdir/
" "$todir"' \
+runtest "non-deletion" 'checkit "$RSYNC -aiHR --del
./$deepstr/ \"$todir\"" "$chkdir
" "$todir"' \
| tee "$outfile"
# Make sure no files were deleted
grep 'deleting ' "$outfile" && test_fail "Erroneous deletions occurred!"
| tee "$outfile"
# Make sure no files were deleted
grep 'deleting ' "$outfile" && test_fail "Erroneous deletions occurred!"
+# Relative with merging.
+$RSYNC -ai "$extradir/down" "$chkdir/"
+
+checkit "$RSYNC -aiR $deepstr '$extrafile' '$todir'" "$chkdir" "$todir"
+
+checkit "$RSYNC -aiR --del $deepstr '$extrafile' '$todir'" "$chkdir" "$todir" \
+ | tee "$outfile"
+
+# Make sure no files were deleted
+grep 'deleting ' "$outfile" && test_fail "Erroneous deletions occurred! (2)"
+
# 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