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:
c2523a0
)
Combine one of the backup tests with --delete-after.
author
Wayne Davison
<wayned@samba.org>
Thu, 7 Apr 2005 09:09:17 +0000
(09:09 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 7 Apr 2005 09:09:17 +0000
(09:09 +0000)
testsuite/backup.test
patch
|
blob
|
blame
|
history
diff --git
a/testsuite/backup.test
b/testsuite/backup.test
index
44732e8
..
c937eea
100644
(file)
--- a/
testsuite/backup.test
+++ b/
testsuite/backup.test
@@
-35,15
+35,20
@@
for fn in name1 name2; do
mv "$todir/$fn~" "$todir/$fn"
done
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 -p "$todir/dname" "$chkdir"
+
+checkit "$RSYNC -avv --no-whole-file --delete-after \
+ --backup --backup-dir=\"$bakdir\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \
| tee "$outfile"
for fn in name1 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"
| tee "$outfile"
for fn in name1 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"
+rm "$bakdir/dname"
-checkit "$RSYNC -avv \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir"
+checkit "$RSYNC -avv
--del
\"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir"
cat $srcdir/[efgr]*.[ch] > "$name1"
cat $srcdir/[ew]*.[ch] > "$name2"
cat $srcdir/[efgr]*.[ch] > "$name1"
cat $srcdir/[ew]*.[ch] > "$name2"