X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/c4a28da3adf75f6c3dede36a9cac938720a5a7c1..7918f2440534993bdda324da839b2ea9a3884757:/testsuite/backup.test

diff --git a/testsuite/backup.test b/testsuite/backup.test
index f2cdb283..dc53368c 100644
--- a/testsuite/backup.test
+++ b/testsuite/backup.test
@@ -11,26 +11,26 @@
 
 bakdir="$tmpdir/bak"
 
-mkdir "$fromdir" "$bakdir"
-name1="$fromdir/name1"
-name2="$fromdir/name2"
+makepath "$fromdir/deep" "$bakdir"
+name1="$fromdir/deep/name1"
+name2="$fromdir/deep/name2"
 
 outfile="$scratchdir/rsync.out"
 
 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"
+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"
-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"
-    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
@@ -39,28 +39,28 @@ echo deleted-file >"$todir/dname"
 cp -p "$todir/dname" "$chkdir"
 
 checkit "$RSYNC -avv --no-whole-file --delete-delay \
-    --backup --backup-dir=\"$bakdir\" \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" \
+    --backup --backup-dir='$bakdir' '$fromdir/' '$todir/'" "$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"
 done
 diff -r $diffopt "$chkdir" "$bakdir" || test_fail "backup dir contents are bogus"
 rm "$bakdir/dname"
 
-checkit "$RSYNC -avv --del \"$fromdir/\" \"$chkdir/\"" "$fromdir" "$chkdir"
+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"
 
-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"
 
-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