summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-12-09 00:24:11 +0000
committerWayne Davison <wayned@samba.org>2006-12-09 00:24:11 +0000
commitbadb8c24b9954a4c6f4725452c8e73f5f24cf2df (patch)
treee12df6e6baebd117b77e383039a24ca86a2c9718 /testsuite
parentbfd3137246794e3eee55ae8e19968d50006050da (diff)
downloadrsync-badb8c24b9954a4c6f4725452c8e73f5f24cf2df.tar.gz
Handle the new output from the hard-link code, including a fix
for a long-standing bug combinding -H with --compare-dest.
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/itemize.test10
1 files changed, 4 insertions, 6 deletions
diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index ddb8c688..5085f973 100644
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -96,7 +96,7 @@ cat <<EOT >"$chkfile"
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"
@@ -175,7 +175,6 @@ bar/baz/rsync is uptodate
foo/ 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
@@ -224,7 +223,7 @@ bar/baz/rsync is uptodate
foo/ 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
diff $diffopt "$chkfile" "$outfile" || test_fail "test 14 failed"
@@ -233,8 +232,6 @@ rm -rf "$to2dir"
$RSYNC -ivvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| 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/
@@ -243,6 +240,7 @@ cd bar/baz/
cd foo/
.f foo/config1
.f foo/config2
+.f foo/extra
.L foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
@@ -266,7 +264,7 @@ bar/baz/rsync is uptodate
foo/ 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
diff $diffopt "$chkfile" "$outfile" || test_fail "test 17 failed"