[BACK]Return to backup.test CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / rsync / testsuite

Diff for /embedaddon/rsync/testsuite/backup.test between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2012/02/17 15:09:30 version 1.1.1.2, 2013/10/14 07:51:15
Line 11 Line 11
   
 bakdir="$tmpdir/bak"  bakdir="$tmpdir/bak"
   
makepath "$fromdir/deep" "$bakdir"makepath "$fromdir/deep" "$bakdir/dname"
 name1="$fromdir/deep/name1"  name1="$fromdir/deep/name1"
 name2="$fromdir/deep/name2"  name2="$fromdir/deep/name2"
   
Line 20  outfile="$scratchdir/rsync.out" Line 20  outfile="$scratchdir/rsync.out"
 cat "$srcdir"/[gr]*.[ch] > "$name1"  cat "$srcdir"/[gr]*.[ch] > "$name1"
 cat "$srcdir"/[et]*.[ch] > "$name2"  cat "$srcdir"/[et]*.[ch] > "$name2"
   
checkit "$RSYNC -avv '$fromdir/' '$todir/'" "$fromdir" "$todir"checkit "$RSYNC -ai --info=backup '$fromdir/' '$todir/'" "$fromdir" "$todir"
   
checkit "$RSYNC -avv '$fromdir/' '$chkdir/'" "$fromdir" "$chkdir"checkit "$RSYNC -ai --info=backup '$fromdir/' '$chkdir/'" "$fromdir" "$chkdir"
 cat "$srcdir"/[fgpr]*.[ch] > "$name1"  cat "$srcdir"/[fgpr]*.[ch] > "$name1"
 cat "$srcdir"/[etw]*.[ch] > "$name2"  cat "$srcdir"/[etw]*.[ch] > "$name2"
   
$RSYNC -avv --no-whole-file --backup "$fromdir/" "$todir/" \$RSYNC -ai --info=backup --no-whole-file --backup "$fromdir/" "$todir/" \
     | tee "$outfile"      | tee "$outfile"
 for fn in deep/name1 deep/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"
Line 38  done Line 38  done
 echo deleted-file >"$todir/dname"  echo deleted-file >"$todir/dname"
 cp_touch "$todir/dname" "$chkdir"  cp_touch "$todir/dname" "$chkdir"
   
checkit "$RSYNC -avv --no-whole-file --delete-delay \checkit "$RSYNC -ai --info=backup --no-whole-file --delete-delay \
     --backup --backup-dir='$bakdir' '$fromdir/' '$todir/'" "$fromdir" "$todir" \      --backup --backup-dir='$bakdir' '$fromdir/' '$todir/'" "$fromdir" "$todir" \
     | tee "$outfile"      | tee "$outfile"
   
Line 48  done Line 48  done
 diff -r $diffopt "$chkdir" "$bakdir" || test_fail "backup dir contents are bogus"  diff -r $diffopt "$chkdir" "$bakdir" || test_fail "backup dir contents are bogus"
 rm "$bakdir/dname"  rm "$bakdir/dname"
   
checkit "$RSYNC -avv --del '$fromdir/' '$chkdir/'" "$fromdir" "$chkdir"checkit "$RSYNC -ai --info=backup --del '$fromdir/' '$chkdir/'" "$fromdir" "$chkdir"
 cat "$srcdir"/[efgr]*.[ch] > "$name1"  cat "$srcdir"/[efgr]*.[ch] > "$name1"
 cat "$srcdir"/[ew]*.[ch] > "$name2"  cat "$srcdir"/[ew]*.[ch] > "$name2"
   
checkit "$RSYNC -avv --inplace --no-whole-file --backup --backup-dir='$bakdir' '$fromdir/' '$todir/'" "$fromdir" "$todir" \checkit "$RSYNC -ai --info=backup --inplace --no-whole-file --backup --backup-dir='$bakdir' '$fromdir/' '$todir/'" "$fromdir" "$todir" \
     | tee "$outfile"      | tee "$outfile"
   
 for fn in deep/name1 deep/name2; do  for fn in deep/name1 deep/name2; do
Line 60  for fn in deep/name1 deep/name2; do Line 60  for fn in deep/name1 deep/name2; do
 done  done
 diff -r $diffopt "$chkdir" "$bakdir" || test_fail "backup dir contents are bogus"  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 -ai --info=backup --inplace --no-whole-file '$fromdir/' '$bakdir/'" "$fromdir" "$bakdir"
   
 # The script would have aborted on error, so getting here means we've won.  # The script would have aborted on error, so getting here means we've won.
 exit 0  exit 0
Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>