summaryrefslogtreecommitdiff
path: root/testsuite/backup.test
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2005-04-07 09:09:17 +0000
committerWayne Davison <wayned@samba.org>2005-04-07 09:09:17 +0000
commitcd36049cd18485acda2ba29791ebc827888448ea (patch)
treefdb58c332f51ffa3301f580f2bbc4003dee8fe34 /testsuite/backup.test
parentc2523a054188463f9f058c0b8624a47f0e370718 (diff)
downloadrsync-cd36049cd18485acda2ba29791ebc827888448ea.tar.gz
Combine one of the backup tests with --delete-after.
Diffstat (limited to 'testsuite/backup.test')
-rw-r--r--testsuite/backup.test9
1 files changed, 7 insertions, 2 deletions
diff --git a/testsuite/backup.test b/testsuite/backup.test
index 44732e89..c937eeaf 100644
--- a/testsuite/backup.test
+++ b/testsuite/backup.test
@@ -35,15 +35,20 @@ for fn in name1 name2; do
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"
+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"