Handle slight differences in the output of protocol 30's incremental mode.

testsuite/itemize.test

@@ -10,6 +10,15 @@
 
 . "$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"
@@ -37,12 +46,13 @@ rm -f "$to2dir" "$to2dir.test"
 
 $RSYNC -iplr "$fromdir/" "$todir/" \
     | tee "$outfile"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 cd+++++++ ./
 cd+++++++ bar/
+cd+++++++ foo/_P30_
 cd+++++++ bar/baz/
 >f+++++++ bar/baz/rsync
-cd+++++++ foo/
+cd+++++++ foo/_P29_
 >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"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 >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"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
+.d..t.... foo/_P30_
 .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
@@ -92,7 +103,7 @@ chmod 600 "$fromdir/foo/config2"
 $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
@@ -106,7 +117,7 @@ $RSYNC -a -f '-! */' "$fromdir/" "$todir"
 $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
     | tee "$outfile"
 filter_outfile
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 .d        ./
 .d        bar/
 .d        bar/baz/
@@ -124,7 +135,7 @@ touch "$todir/foo/config2"
 $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"
@@ -133,7 +144,7 @@ chmod 757 "$todir/foo/config1"
 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
@@ -142,7 +153,7 @@ diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
 $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/
@@ -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"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 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
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 ./ 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
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 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"
-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"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 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
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 ./ 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
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 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"
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 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
-cat <<EOT >"$chkfile"
+sed -e "$sed_cmd" <<EOT >"$chkfile"
 ./ is uptodate
 bar/ is uptodate
 bar/baz/ is uptodate