summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2008-03-19 08:57:41 -0700
committerWayne Davison <wayned@samba.org>2008-03-19 08:59:44 -0700
commit6e0bf4d840c8718e832bde6ffb34470f2167047d (patch)
treee5323e04166a21dc528ccf0d03af393d3ee43963 /testsuite
parent83a8ca7b14483826c85f7cc0e0e38ed9ce387d83 (diff)
downloadrsync-6e0bf4d840c8718e832bde6ffb34470f2167047d.tar.gz
rsync-6e0bf4d840c8718e832bde6ffb34470f2167047d.tar.bz2
rsync-6e0bf4d840c8718e832bde6ffb34470f2167047d.zip
Some more minor changes for the skip/missing/dry_run code.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/missing.test5
1 files changed, 2 insertions, 3 deletions
diff --git a/testsuite/missing.test b/testsuite/missing.test
index 705050b4..82eaeb3c 100644
--- a/testsuite/missing.test
+++ b/testsuite/missing.test
@@ -7,8 +7,7 @@
. $srcdir/testsuite/rsync.fns
-mkdir "$fromdir" "$todir"
-mkdir "$fromdir/subdir"
+makepath "$fromdir/subdir" "$todir"
echo data >"$fromdir/subdir/file"
echo data >"$todir/other"
@@ -24,5 +23,5 @@ $RSYNC -n -r -R --no-implied-dirs -y "$fromdir/./subdir/file" "$todir/" \
# Test 3: --delete-after pass skipped when last dir is dry-missing
$RSYNC -n -r --delete-after -i "$fromdir/" "$todir/" | tee "$scratchdir/out"
-grep '^\*deleting other' "$scratchdir/out" >/dev/null \
+grep '^\*deleting * other' "$scratchdir/out" >/dev/null \
|| test_fail 'test 3 failed'