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
Document the new p (perishable) filter modifier.
[rsync/rsync.git]
/
testsuite
/
itemize.test
diff --git
a/testsuite/itemize.test
b/testsuite/itemize.test
index
9620a02
..
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,6
+26,15
@@
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"
@@
-130,8
+139,7
@@
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=../ld "$fromdir/" "$todir/" \
+$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
@@
-147,16
+155,16
@@
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"
cat <<EOT >"$chkfile"
hf foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
| tee "$outfile"
cat <<EOT >"$chkfile"
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"
@@
-173,8
+181,8
@@
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"
@@
-186,26
+194,26
@@
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"
cat <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
| tee "$outfile"
cat <<EOT >"$chkfile"
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"
cat <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
| tee "$outfile"
cat <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 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
cat <<EOT >"$chkfile"
| tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile"
@@
-221,8
+229,8
@@
foo/sym is uptodate
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 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:
| tee "$outfile"
filter_outfile
# TODO fix really-old problem when combining -H with --compare-dest:
@@
-239,15
+247,15
@@
cd foo/
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 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"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed"
| tee "$outfile"
cat <<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 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"