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
- Put directory retouching code into a separate function that
[rsync/rsync.git]
/
testsuite
/
itemize.test
diff --git
a/testsuite/itemize.test
b/testsuite/itemize.test
index
c05129f
..
a165fa1
100644
(file)
--- a/
testsuite/itemize.test
+++ b/
testsuite/itemize.test
@@
-10,7
+10,16
@@
. "$suitedir/rsync.fns"
. "$suitedir/rsync.fns"
-lddir="$tmpdir/ld"
+case "$RSYNC" in
+*protocol=29*)
+ sed_cmd='/_P30_/d; s/_P29_//'
+ ;;
+*)
+ sed_cmd='/_P29_/d; s/_P30_//'
+ ;;
+esac
+
+to2dir="$tmpdir/to2"
chkfile="$scratchdir/rsync.chk"
outfile="$scratchdir/rsync.out"
chkfile="$scratchdir/rsync.chk"
outfile="$scratchdir/rsync.out"
@@
-26,14
+35,24
@@
ln -s ../bar/baz/rsync "$fromdir/foo/sym"
umask 022
ln "$fromdir/foo/config1" "$fromdir/foo/extra"
umask 022
ln "$fromdir/foo/config1" "$fromdir/foo/extra"
+# Check if the OS can hard-link symlinks or not
+ln -s no-such-dir "$to2dir"
+if ln "$to2dir" "$to2dir.test" 2>/dev/null; then
+ L=hL
+else
+ L=cL
+fi
+rm -f "$to2dir" "$to2dir.test"
+
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
cd+++++++ ./
cd+++++++ bar/
cd+++++++ ./
cd+++++++ bar/
+cd+++++++ foo/_P30_
cd+++++++ bar/baz/
>f+++++++ bar/baz/rsync
cd+++++++ bar/baz/
>f+++++++ bar/baz/rsync
-cd+++++++ foo/
+cd+++++++ foo/
_P29_
>f+++++++ foo/config1
>f+++++++ foo/config2
>f+++++++ foo/extra
>f+++++++ foo/config1
>f+++++++ foo/config2
>f+++++++ foo/extra
@@
-48,7
+67,7
@@
cp -p "$srcdir/configure.in" "$fromdir/foo/config2"
chmod 601 "$fromdir/foo/config2"
$RSYNC -iplrH "$fromdir/" "$todir/" \
| tee "$outfile"
chmod 601 "$fromdir/foo/config2"
$RSYNC -iplrH "$fromdir/" "$todir/" \
| tee "$outfile"
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
>f..T.... bar/baz/rsync
>f..T.... foo/config1
>f.sTp... foo/config2
>f..T.... bar/baz/rsync
>f..T.... foo/config1
>f.sTp... foo/config2
@@
-68,9
+87,10
@@
chmod 777 "$todir/bar/baz/rsync"
$RSYNC -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
$RSYNC -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+.d..t.... foo/_P30_
.f..tp... bar/baz/rsync
.f..tp... bar/baz/rsync
-.d..t.... foo/
+.d..t.... foo/
_P29_
.f..t.... foo/config1
>fcstp... foo/config2
cL..T.... foo/sym -> ../bar/baz/rsync
.f..t.... foo/config1
>fcstp... foo/config2
cL..T.... foo/sym -> ../bar/baz/rsync
@@
-83,11
+103,11
@@
chmod 600 "$fromdir/foo/config2"
$RSYNC -vvplrH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
$RSYNC -vvplrH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
bar/baz/rsync is uptodate
foo/config1 is uptodate
foo/config2
bar/baz/rsync is uptodate
foo/config1 is uptodate
foo/config2
-"foo/extra" is a hard link
+foo/extra is uptodate
foo/sym is uptodate
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
foo/sym is uptodate
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
@@
-97,7
+117,7
@@
$RSYNC -a -f '-! */' "$fromdir/" "$todir"
$RSYNC -ivvplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
$RSYNC -ivvplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
.d ./
.d bar/
.d bar/baz/
.d ./
.d bar/
.d bar/baz/
@@
-115,7
+135,7
@@
touch "$todir/foo/config2"
$RSYNC -vplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
$RSYNC -vplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 6 failed"
foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 6 failed"
@@
-124,160
+144,141
@@
chmod 757 "$todir/foo/config1"
touch "$todir/foo/config2"
$RSYNC -iplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
touch "$todir/foo/config2"
$RSYNC -iplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
.f...p... foo/config1
>f..t.... foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
.f...p... foo/config1
>f..t.... foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
-mv "$todir" "$lddir"
-$RSYNC -ivvplrtH --copy-dest=../ld "$fromdir/" "$todir/" \
+$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
-cd
+++++++
./
-cd
+++++++
bar/
-cd
+++++++
bar/baz/
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+cd
./
+cd
bar/
+cd
bar/baz/
cf bar/baz/rsync
cf bar/baz/rsync
-cd
+++++++
foo/
+cd
foo/
cf foo/config1
cf foo/config2
hf foo/extra => foo/config1
cf foo/config1
cf foo/config2
hf foo/extra => foo/config1
-cL
..T....
foo/sym -> ../bar/baz/rsync
+cL
foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
-rm -rf "$todir"
-$RSYNC -iplrtH --copy-dest=../
ld "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -iplrtH --copy-dest=../
to "$fromdir/" "$to2
dir/" \
| tee "$outfile"
| tee "$outfile"
-cat <<EOT >"$chkfile"
-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
hf foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
hf foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
-rm -rf "$todir"
-$RSYNC -vvplrtH --copy-dest="$
lddir" "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -vvplrtH --copy-dest="$
todir" "$fromdir/" "$to2
dir/" \
| tee "$outfile"
filter_outfile
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
-./
-bar/
-bar/baz/
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+./
is uptodate
+bar/
is uptodate
+bar/baz/
is uptodate
bar/baz/rsync is uptodate
bar/baz/rsync is uptodate
-foo/
+foo/
is uptodate
foo/config1 is uptodate
foo/config2 is uptodate
foo/config1 is uptodate
foo/config2 is uptodate
-"foo/extra" is a hard link
foo/extra => foo/config1
foo/sym is uptodate
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 10 failed"
foo/extra => foo/config1
foo/sym is uptodate
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 10 failed"
-rm -rf "$todir"
-$RSYNC -ivvplrtH --link-dest="$
lddir" "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -ivvplrtH --link-dest="$
todir" "$fromdir/" "$to2
dir/" \
| tee "$outfile"
filter_outfile
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
-cd
+++++++
./
-cd
+++++++
bar/
-cd
+++++++
bar/baz/
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+cd
./
+cd
bar/
+cd
bar/baz/
hf bar/baz/rsync
hf bar/baz/rsync
-cd
+++++++
foo/
+cd
foo/
hf foo/config1
hf foo/config2
hf foo/extra => foo/config1
hf foo/config1
hf foo/config2
hf foo/extra => foo/config1
-
h
L foo/sym -> ../bar/baz/rsync
+
$
L foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
-rm -rf "$todir"
-$RSYNC -iplrtH --dry-run --link-dest=../
ld "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -iplrtH --dry-run --link-dest=../
to "$fromdir/" "$to2
dir/" \
| tee "$outfile"
| tee "$outfile"
-cat <<EOT >"$chkfile"
-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
-rm -rf "$todir"
-$RSYNC -iplrtH --link-dest=../
ld "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -iplrtH --link-dest=../
to "$fromdir/" "$to2
dir/" \
| tee "$outfile"
| tee "$outfile"
-cat <<EOT >"$chkfile"
-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
EOT
EOT
-diff $diffopt "$chkfile" "$outfile" || test_fail "test 1
2
failed"
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 1
3
failed"
-rm -rf "$todir"
-$RSYNC -vvplrtH --link-dest="$
lddir" "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -vvplrtH --link-dest="$
todir" "$fromdir/" "$to2
dir/" \
| tee "$outfile"
filter_outfile
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
-./
-bar/
-bar/baz/
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+./
is uptodate
+bar/
is uptodate
+bar/baz/
is uptodate
bar/baz/rsync is uptodate
bar/baz/rsync is uptodate
-foo/
+foo/
is uptodate
foo/config1 is uptodate
foo/config2 is uptodate
foo/config1 is uptodate
foo/config2 is uptodate
-"foo/extra" is a hard link
+foo/extra is uptodate
foo/sym is uptodate
EOT
foo/sym is uptodate
EOT
-diff $diffopt "$chkfile" "$outfile" || test_fail "test 1
3
failed"
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 1
4
failed"
-rm -rf "$todir"
-$RSYNC -ivvplrtH --compare-dest="$
lddir" "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -ivvplrtH --compare-dest="$
todir" "$fromdir/" "$to2
dir/" \
| tee "$outfile"
filter_outfile
| tee "$outfile"
filter_outfile
-# TODO fix really-old problem when combining -H with --compare-dest:
-# missing output for foo/extra hard-link (and it might not be updated)!
-cat <<EOT >"$chkfile"
-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+cd ./
+cd bar/
+cd bar/baz/
.f bar/baz/rsync
.f bar/baz/rsync
-cd
+++++++
foo/
+cd
foo/
.f foo/config1
.f foo/config2
.f foo/config1
.f foo/config2
+.f foo/extra
.L foo/sym -> ../bar/baz/rsync
EOT
.L foo/sym -> ../bar/baz/rsync
EOT
-diff $diffopt "$chkfile" "$outfile" || test_fail "test 1
4
failed"
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 1
5
failed"
-rm -rf "$todir"
-$RSYNC -iplrtH --compare-dest="$
lddir" "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -iplrtH --compare-dest="$
todir" "$fromdir/" "$to2
dir/" \
| tee "$outfile"
| tee "$outfile"
-cat <<EOT >"$chkfile"
-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
+sed -e "$sed_cmd" <<EOT >"$chkfile"
EOT
EOT
-diff $diffopt "$chkfile" "$outfile" || test_fail "test 1
5
failed"
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 1
6
failed"
-rm -rf "$todir"
-$RSYNC -vvplrtH --compare-dest="$
lddir" "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -vvplrtH --compare-dest="$
todir" "$fromdir/" "$to2
dir/" \
| tee "$outfile"
filter_outfile
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
-./
-bar/
-bar/baz/
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+./
is uptodate
+bar/
is uptodate
+bar/baz/
is uptodate
bar/baz/rsync is uptodate
bar/baz/rsync is uptodate
-foo/
+foo/
is uptodate
foo/config1 is uptodate
foo/config2 is uptodate
foo/config1 is uptodate
foo/config2 is uptodate
-"foo/extra" is a hard link
+foo/extra is uptodate
foo/sym is uptodate
EOT
foo/sym is uptodate
EOT
-diff $diffopt "$chkfile" "$outfile" || test_fail "test 1
6
failed"
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 1
7
failed"
# The script would have aborted on error, so getting here means we've won.
exit 0
# The script would have aborted on error, so getting here means we've won.
exit 0