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
Die if we sent --max-delete=0 to a receiving side that is too old.
[rsync/rsync.git]
/
testsuite
/
itemize.test
diff --git
a/testsuite/itemize.test
b/testsuite/itemize.test
index
c77ace5
..
ddb8c68
100644
(file)
--- a/
testsuite/itemize.test
+++ b/
testsuite/itemize.test
@@
-10,7
+10,7
@@
. "$suitedir/rsync.fns"
. "$suitedir/rsync.fns"
-
lddir="$tmpdir/ld
"
+
to2dir="$tmpdir/to2
"
chkfile="$scratchdir/rsync.chk"
outfile="$scratchdir/rsync.out"
chkfile="$scratchdir/rsync.chk"
outfile="$scratchdir/rsync.out"
@@
-26,9
+26,19
@@
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"
cat <<EOT >"$chkfile"
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
+cd+++++++ ./
cd+++++++ bar/
cd+++++++ bar/baz/
>f+++++++ bar/baz/rsync
cd+++++++ bar/
cd+++++++ bar/baz/
>f+++++++ bar/baz/rsync
@@
-129,45
+139,40
@@
cat <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
-mv "$todir" "$lddir"
-$RSYNC -ivvplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
+$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-
.d..t....
./
-cd
+++++++
bar/
-cd
+++++++
bar/baz/
+
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=
"$lddir" "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -iplrtH --copy-dest=
../to "$fromdir/" "$to2
dir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
| tee "$outfile"
cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
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
cat <<EOT >"$chkfile"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-./
-bar/
-bar/baz/
+./
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/extra" is a hard link
foo/config1 is uptodate
foo/config2 is uptodate
"foo/extra" is a hard link
@@
-176,96
+181,95
@@
foo/sym is uptodate
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 10 failed"
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
cat <<EOT >"$chkfile"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-
.d..t....
./
-cd
+++++++
bar/
-cd
+++++++
bar/baz/
+
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 --
link-dest="$lddir" "$fromdir/" "$to
dir/" \
+rm -rf "$to
2
dir"
+$RSYNC -iplrtH --
dry-run --link-dest=../to "$fromdir/" "$to2
dir/" \
| tee "$outfile"
cat <<EOT >"$chkfile"
| tee "$outfile"
cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
-rm -rf "$todir"
-$RSYNC -vvplrtH --link-dest="$lddir" "$fromdir/" "$todir/" \
+rm -rf "$to2dir"
+$RSYNC -iplrtH --link-dest=../to "$fromdir/" "$to2dir/" \
+ | tee "$outfile"
+cat <<EOT >"$chkfile"
+EOT
+diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
+
+rm -rf "$to2dir"
+$RSYNC -vvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-./
-bar/
-bar/baz/
+./
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/extra" is a hard link
foo/sym is uptodate
EOT
foo/config1 is uptodate
foo/config2 is uptodate
"foo/extra" is a hard link
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
# 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"
| 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"
-
.d..t....
./
-cd
+++++++
bar/
-cd
+++++++
bar/baz/
+
cd
./
+cd
bar/
+cd
bar/baz/
.f bar/baz/rsync
.f bar/baz/rsync
-cd
+++++++
foo/
+cd
foo/
.f foo/config1
.f foo/config2
.L foo/sym -> ../bar/baz/rsync
EOT
.f foo/config1
.f foo/config2
.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"
cat <<EOT >"$chkfile"
| tee "$outfile"
cat <<EOT >"$chkfile"
-.d..t.... ./
-cd+++++++ bar/
-cd+++++++ bar/baz/
-cd+++++++ foo/
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
cat <<EOT >"$chkfile"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
-./
-bar/
-bar/baz/
+./
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/extra" is a hard link
foo/sym is uptodate
EOT
foo/config1 is uptodate
foo/config2 is uptodate
"foo/extra" is a hard link
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