Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some deny-rsync fixes:
[rsync/rsync.git]
/
testsuite
/
itemize.test
diff --git
a/testsuite/itemize.test
b/testsuite/itemize.test
index
636751e
..
bdb08c2
100644
(file)
--- a/
testsuite/itemize.test
+++ b/
testsuite/itemize.test
@@
-25,14
+25,14
@@
umask 0
ln -s ../bar/baz/rsync "$fromdir/foo/sym"
umask 022
ln "$fromdir/foo/config1" "$fromdir/foo/extra"
ln -s ../bar/baz/rsync "$fromdir/foo/sym"
umask 022
ln "$fromdir/foo/config1" "$fromdir/foo/extra"
+rm -f "$to2dir"
-# Check if
the OS can hard-link symlinks or not
-if
ln "$fromdir/foo/sym" "$to2dir" 2
>/dev/null; then
+# Check if
rsync is set to hard-link symlinks.
+if
egrep '^#define CAN_HARDLINK_SYMLINK 1' config.h
>/dev/null; then
L=hL
else
L=cL
fi
L=hL
else
L=cL
fi
-rm -f "$to2dir"
# Check if rsync can preserve time on symlinks
case "$RSYNC" in
# Check if rsync can preserve time on symlinks
case "$RSYNC" in
@@
-51,15
+51,15
@@
esac
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-cd
+++++++++
./
-cd
+++++++++
bar/
-cd
+++++++++
bar/baz/
->f
+++++++++
bar/baz/rsync
-cd
+++++++++
foo/
->f
+++++++++
foo/config1
->f
+++++++++
foo/config2
->f
+++++++++
foo/extra
-cL
+++++++++
foo/sym -> ../bar/baz/rsync
+cd
$all_plus
./
+cd
$all_plus
bar/
+cd
$all_plus
bar/baz/
+>f
$all_plus
bar/baz/rsync
+cd
$all_plus
foo/
+>f
$all_plus
foo/config1
+>f
$all_plus
foo/config2
+>f
$all_plus
foo/extra
+cL
$all_plus
foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
@@
-71,10
+71,10
@@
chmod 601 "$fromdir/foo/config2"
$RSYNC -iplrH "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
$RSYNC -iplrH "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
->f..T.
.....
bar/baz/rsync
->f..T.
.....
foo/config1
->f.sTp
.....
foo/config2
-hf..T.
.....
foo/extra => foo/config1
+>f..T.
$dots
bar/baz/rsync
+>f..T.
$dots
foo/config1
+>f.sTp
$dots
foo/config2
+hf..T.
$dots
foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
@@
-91,11
+91,11
@@
chmod 777 "$todir/bar/baz/rsync"
$RSYNC -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
$RSYNC -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.f..tp
.....
bar/baz/rsync
-.d..t.
.....
foo/
-.f..t.
.....
foo/config1
->fcstp
.....
foo/config2
-cL
.$T......
foo/sym -> ../bar/baz/rsync
+.f..tp
$dots
bar/baz/rsync
+.d..t.
$dots
foo/
+.f..t.
$dots
foo/config1
+>fcstp
$dots
foo/config2
+cL
c$T.$dots
foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
@@
-120,15
+120,15
@@
$RSYNC -ivvplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-.d
./
-.d
bar/
-.d
bar/baz/
-.f...p
.....
bar/baz/rsync
-.d
foo/
-.f
foo/config1
->f..t.
.....
foo/config2
-hf
foo/extra
-.L
foo/sym -> ../bar/baz/rsync
+.d
$allspace
./
+.d
$allspace
bar/
+.d
$allspace
bar/baz/
+.f...p
$dots
bar/baz/rsync
+.d
$allspace
foo/
+.f
$allspace
foo/config1
+>f..t.
$dots
foo/config2
+hf
$allspace
foo/extra
+.L
$allspace
foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
@@
-147,8
+147,8
@@
touch "$todir/foo/config2"
$RSYNC -iplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
$RSYNC -iplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
-.f...p
.....
foo/config1
->f..t.
.....
foo/config2
+.f...p
$dots
foo/config1
+>f..t.
$dots
foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
@@
-156,29
+156,29
@@
$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
case `tail -1 "$outfile"` in
| tee "$outfile"
filter_outfile
case `tail -1 "$outfile"` in
-cL
.
.t*)
- sym_dots=
'..t......'
- L_sym_dots=
'cL..t......'
+cL
c
.t*)
+ sym_dots=
"c.t.$dots"
+ L_sym_dots=
"cL$sym_dots"
is_uptodate='-> ../bar/baz/rsync'
echo "cL$sym_dots foo/sym $is_uptodate" >"$chkfile.extra"
L=cL
;;
*)
is_uptodate='-> ../bar/baz/rsync'
echo "cL$sym_dots foo/sym $is_uptodate" >"$chkfile.extra"
L=cL
;;
*)
- sym_dots=
' '
- L_sym_dots=
'.L '
+ sym_dots=
"$allspace"
+ L_sym_dots=
".L$allspace"
is_uptodate='is uptodate'
touch "$chkfile.extra"
;;
esac
cat <<EOT >"$chkfile"
is_uptodate='is uptodate'
touch "$chkfile.extra"
;;
esac
cat <<EOT >"$chkfile"
-cd
./
-cd
bar/
-cd
bar/baz/
-cf
bar/baz/rsync
-cd
foo/
-cf
foo/config1
-cf
foo/config2
-hf
foo/extra => foo/config1
+cd
$allspace
./
+cd
$allspace
bar/
+cd
$allspace
bar/baz/
+cf
$allspace
bar/baz/rsync
+cd
$allspace
foo/
+cf
$allspace
foo/config1
+cf
$allspace
foo/config2
+hf
$allspace
foo/extra => foo/config1
cL$sym_dots foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
cL$sym_dots foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
@@
-187,7
+187,7
@@
rm -rf "$to2dir"
$RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
cat - "$chkfile.extra" <<EOT >"$chkfile"
$RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
cat - "$chkfile.extra" <<EOT >"$chkfile"
-hf
foo/extra => foo/config1
+hf
$allspace
foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
@@
-213,14
+213,14
@@
$RSYNC -ivvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-cd
./
-cd
bar/
-cd
bar/baz/
-hf
bar/baz/rsync
-cd
foo/
-hf
foo/config1
-hf
foo/config2
-hf
foo/extra => foo/config1
+cd
$allspace
./
+cd
$allspace
bar/
+cd
$allspace
bar/baz/
+hf
$allspace
bar/baz/rsync
+cd
$allspace
foo/
+hf
$allspace
foo/config1
+hf
$allspace
foo/config2
+hf
$allspace
foo/extra => foo/config1
$L$sym_dots foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
$L$sym_dots foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
@@
-261,14
+261,14
@@
$RSYNC -ivvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-cd
./
-cd
bar/
-cd
bar/baz/
-.f
bar/baz/rsync
-cd
foo/
-.f
foo/config1
-.f
foo/config2
-.f
foo/extra
+cd
$allspace
./
+cd
$allspace
bar/
+cd
$allspace
bar/baz/
+.f
$allspace
bar/baz/rsync
+cd
$allspace
foo/
+.f
$allspace
foo/config1
+.f
$allspace
foo/config2
+.f
$allspace
foo/extra
$L_sym_dots foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
$L_sym_dots foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"