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
The sender now sets IOERR_GENERAL in more skipped-file instances.
[rsync/rsync.git]
/
testsuite
/
backup.test
diff --git
a/testsuite/backup.test
b/testsuite/backup.test
index
44732e8
..
4227b86
100644
(file)
--- a/
testsuite/backup.test
+++ b/
testsuite/backup.test
@@
-11,51
+11,56
@@
bakdir="$tmpdir/bak"
bakdir="$tmpdir/bak"
-m
kdir "$fromdir
" "$bakdir"
-name1="$fromdir/name1"
-name2="$fromdir/name2"
+m
akepath "$fromdir/deep
" "$bakdir"
+name1="$fromdir/
deep/
name1"
+name2="$fromdir/
deep/
name2"
outfile="$scratchdir/rsync.out"
outfile="$scratchdir/rsync.out"
-cat
$srcdir
/[gr]*.[ch] > "$name1"
-cat
$srcdir
/[et]*.[ch] > "$name2"
+cat
"$srcdir"
/[gr]*.[ch] > "$name1"
+cat
"$srcdir"
/[et]*.[ch] > "$name2"
-checkit "$RSYNC -avv
\"$fromdir/\" \"$todir/\"
" "$fromdir" "$todir"
+checkit "$RSYNC -avv
'$fromdir/' '$todir/'
" "$fromdir" "$todir"
-checkit "$RSYNC -avv
\"$fromdir/\" \"$chkdir/\"
" "$fromdir" "$chkdir"
-cat
$srcdir
/[fgpr]*.[ch] > "$name1"
-cat
$srcdir
/[etw]*.[ch] > "$name2"
+checkit "$RSYNC -avv
'$fromdir/' '$chkdir/'
" "$fromdir" "$chkdir"
+cat
"$srcdir"
/[fgpr]*.[ch] > "$name1"
+cat
"$srcdir"
/[etw]*.[ch] > "$name2"
$RSYNC -avv --no-whole-file --backup "$fromdir/" "$todir/" \
| tee "$outfile"
$RSYNC -avv --no-whole-file --backup "$fromdir/" "$todir/" \
| tee "$outfile"
-for fn in
name1
name2; do
+for fn in
deep/name1 deep/
name2; do
grep "backed up $fn to $fn~" "$outfile" >/dev/null || test_fail "no backup message output for $fn"
grep "backed up $fn to $fn~" "$outfile" >/dev/null || test_fail "no backup message output for $fn"
- diff $diffopt "$fromdir/$fn" "$todir" || test_fail "copy of $fn failed"
+ diff $diffopt "$fromdir/$fn" "$todir
/$fn
" || test_fail "copy of $fn failed"
diff $diffopt "$chkdir/$fn" "$todir/$fn~" || test_fail "backup of $fn to $fn~ failed"
mv "$todir/$fn~" "$todir/$fn"
done
diff $diffopt "$chkdir/$fn" "$todir/$fn~" || test_fail "backup of $fn to $fn~ failed"
mv "$todir/$fn~" "$todir/$fn"
done
-checkit "$RSYNC -avv --no-whole-file --backup --backup-dir=\"$bakdir\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \
+echo deleted-file >"$todir/dname"
+cp_touch "$todir/dname" "$chkdir"
+
+checkit "$RSYNC -avv --no-whole-file --delete-delay \
+ --backup --backup-dir='$bakdir' '$fromdir/' '$todir/'" "$fromdir" "$todir" \
| tee "$outfile"
| tee "$outfile"
-for fn in
name1
name2; do
+for fn in
deep/name1 deep/
name2; do
grep "backed up $fn to .*/$fn$" "$outfile" >/dev/null || test_fail "no backup message output for $fn"
done
diff -r $diffopt "$chkdir" "$bakdir" || test_fail "backup dir contents are bogus"
grep "backed up $fn to .*/$fn$" "$outfile" >/dev/null || test_fail "no backup message output for $fn"
done
diff -r $diffopt "$chkdir" "$bakdir" || test_fail "backup dir contents are bogus"
+rm "$bakdir/dname"
-checkit "$RSYNC -avv
\"$fromdir/\" \"$chkdir/\"
" "$fromdir" "$chkdir"
-cat
$srcdir
/[efgr]*.[ch] > "$name1"
-cat
$srcdir
/[ew]*.[ch] > "$name2"
+checkit "$RSYNC -avv
--del '$fromdir/' '$chkdir/'
" "$fromdir" "$chkdir"
+cat
"$srcdir"
/[efgr]*.[ch] > "$name1"
+cat
"$srcdir"
/[ew]*.[ch] > "$name2"
-checkit "$RSYNC -avv --inplace --no-whole-file --backup --backup-dir=
\"$bakdir\" \"$fromdir/\" \"$todir/\"
" "$fromdir" "$todir" \
+checkit "$RSYNC -avv --inplace --no-whole-file --backup --backup-dir=
'$bakdir' '$fromdir/' '$todir/'
" "$fromdir" "$todir" \
| tee "$outfile"
| tee "$outfile"
-for fn in
name1
name2; do
+for fn in
deep/name1 deep/
name2; do
grep "backed up $fn to .*/$fn$" "$outfile" >/dev/null || test_fail "no backup message output for $fn"
done
diff -r $diffopt "$chkdir" "$bakdir" || test_fail "backup dir contents are bogus"
grep "backed up $fn to .*/$fn$" "$outfile" >/dev/null || test_fail "no backup message output for $fn"
done
diff -r $diffopt "$chkdir" "$bakdir" || test_fail "backup dir contents are bogus"
-checkit "$RSYNC -avv --inplace --no-whole-file
\"$fromdir/\" \"$bakdir/\"
" "$fromdir" "$bakdir"
+checkit "$RSYNC -avv --inplace --no-whole-file
'$fromdir/' '$bakdir/'
" "$fromdir" "$bakdir"
# 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