Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
76a1013
)
Handle slight differences in the output of protocol 30's incremental mode.
author
Wayne Davison
<wayned@samba.org>
Thu, 28 Dec 2006 07:54:44 +0000
(07:54 +0000)
committer
Wayne Davison
<wayned@samba.org>
Thu, 28 Dec 2006 07:54:44 +0000
(07:54 +0000)
testsuite/itemize.test
patch
|
blob
|
blame
|
history
diff --git
a/testsuite/itemize.test
b/testsuite/itemize.test
index
5085f97
..
a165fa1
100644
(file)
--- a/
testsuite/itemize.test
+++ b/
testsuite/itemize.test
@@
-10,6
+10,15
@@
. "$suitedir/rsync.fns"
. "$suitedir/rsync.fns"
+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"
to2dir="$tmpdir/to2"
chkfile="$scratchdir/rsync.chk"
@@
-37,12
+46,13
@@
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
@@
-57,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
@@
-77,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
@@
-92,7
+103,7
@@
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
@@
-106,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/
@@
-124,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"
@@
-133,7
+144,7
@@
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
.f...p... foo/config1
>f..t.... foo/config2
EOT
@@
-142,7
+153,7
@@
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
cd ./
cd bar/
cd bar/baz/
cd ./
cd bar/
cd bar/baz/
@@
-158,7
+169,7
@@
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
rm -rf "$to2dir"
$RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
-
cat
<<EOT >"$chkfile"
+
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"
@@
-167,7
+178,7
@@
rm -rf "$to2dir"
$RSYNC -vvplrtH --copy-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
$RSYNC -vvplrtH --copy-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
@@
-184,7
+195,7
@@
rm -rf "$to2dir"
$RSYNC -ivvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
$RSYNC -ivvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
cd ./
cd bar/
cd bar/baz/
cd ./
cd bar/
cd bar/baz/
@@
-200,14
+211,14
@@
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --dry-run --link-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
rm -rf "$to2dir"
$RSYNC -iplrtH --dry-run --link-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --link-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 12 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --link-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
@@
-215,7
+226,7
@@
rm -rf "$to2dir"
$RSYNC -vvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
$RSYNC -vvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
@@
-232,7
+243,7
@@
rm -rf "$to2dir"
$RSYNC -ivvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
$RSYNC -ivvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
cd ./
cd bar/
cd bar/baz/
cd ./
cd bar/
cd bar/baz/
@@
-248,7
+259,7
@@
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
rm -rf "$to2dir"
$RSYNC -iplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed"
@@
-256,7
+267,7
@@
rm -rf "$to2dir"
$RSYNC -vvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
$RSYNC -vvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-
cat
<<EOT >"$chkfile"
+
sed -e "$sed_cmd"
<<EOT >"$chkfile"
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate