From: Wayne Davison Date: Thu, 28 Feb 2008 01:48:25 +0000 (-0800) Subject: Use variables to hold the constant itemized strings so X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/commitdiff_plain/fc29efc38d0da298f97dfbd84e7fbb1d730e0060 Use variables to hold the constant itemized strings so that future changes are easier to make. --- diff --git a/testsuite/devices.test b/testsuite/devices.test index 6bdd4b1a..6fb1127c 100644 --- a/testsuite/devices.test +++ b/testsuite/devices.test @@ -81,14 +81,14 @@ touch -r "$fromdir/block" "$fromdir/block2" $RSYNC -ai "$fromdir/block" "$todir/block2" \ | tee "$outfile" cat <"$chkfile" -cD+++++++++ block +cD$all_plus block EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed" $RSYNC -ai "$fromdir/block2" "$todir/block" \ | tee "$outfile" cat <"$chkfile" -cD+++++++++ block2 +cD$all_plus block2 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed" @@ -97,7 +97,7 @@ sleep 1 $RSYNC -Di "$fromdir/block3" "$todir/block" \ | tee "$outfile" cat <"$chkfile" -cD..T...... block3 +cD..T.$dots block3 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" @@ -105,15 +105,15 @@ $RSYNC -aiHvv "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$chkfile" -.d..t...... ./ -cD..t...... block -cD block2 -cD+++++++++ block3 -hD+++++++++ block2.5 => block3 -cD+++++++++ char -cD+++++++++ char2 -cD+++++++++ char3 -cS+++++++++ fifo +.d..t.$dots ./ +cD..t.$dots block +cD$allspace block2 +cD$all_plus block3 +hD$all_plus block2.5 => block3 +cD$all_plus char +cD$all_plus char2 +cD$all_plus char3 +cS$all_plus fifo EOT if test ! -r "$fromdir/block2.5"; then sed -e '/block2\.5/d' <"$chkfile" >"$chkfile.new" @@ -132,15 +132,15 @@ if test -b "$fromdir/block2.5"; then $RSYNC -aii --link-dest="$todir" "$fromdir/" "$chkdir/" \ | tee "$outfile" cat <"$chkfile" -cd ./ -hD block -hD block2 -hD block2.5 -hD block3 -hD char -hD char2 -hD char3 -hS fifo +cd$allspace ./ +hD$allspace block +hD$allspace block2 +hD$allspace block2.5 +hD$allspace block3 +hD$allspace char +hD$allspace char2 +hD$allspace char3 +hS$allspace fifo EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed" fi diff --git a/testsuite/itemize.test b/testsuite/itemize.test index 0b7300c2..80b50050 100644 --- a/testsuite/itemize.test +++ b/testsuite/itemize.test @@ -53,15 +53,15 @@ esac $RSYNC -iplr "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -cd+++++++++ ./ -cd+++++++++ bar/ -cd+++++++++ bar/baz/ ->f+++++++++ bar/baz/rsync -cd+++++++++ foo/ ->f+++++++++ foo/config1 ->f+++++++++ foo/config2 ->f+++++++++ foo/extra -cL+++++++++ foo/sym -> ../bar/baz/rsync +cd$all_plus ./ +cd$all_plus bar/ +cd$all_plus bar/baz/ +>f$all_plus bar/baz/rsync +cd$all_plus foo/ +>f$all_plus foo/config1 +>f$all_plus foo/config2 +>f$all_plus foo/extra +cL$all_plus foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed" @@ -73,10 +73,10 @@ chmod 601 "$fromdir/foo/config2" $RSYNC -iplrH "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" ->f..T...... bar/baz/rsync ->f..T...... foo/config1 ->f.sTp..... foo/config2 -hf..T...... foo/extra => foo/config1 +>f..T.$dots bar/baz/rsync +>f..T.$dots foo/config1 +>f.sTp$dots foo/config2 +hf..T.$dots foo/extra => foo/config1 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed" @@ -93,11 +93,11 @@ chmod 777 "$todir/bar/baz/rsync" $RSYNC -iplrtc "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.f..tp..... bar/baz/rsync -.d..t...... foo/ -.f..t...... foo/config1 ->fcstp..... foo/config2 -cL.$T...... foo/sym -> ../bar/baz/rsync +.f..tp$dots bar/baz/rsync +.d..t.$dots foo/ +.f..t.$dots foo/config1 +>fcstp$dots foo/config2 +cL.$T.$dots foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed" @@ -122,15 +122,15 @@ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \ | tee "$outfile" filter_outfile cat <"$chkfile" -.d ./ -.d bar/ -.d bar/baz/ -.f...p..... bar/baz/rsync -.d foo/ -.f foo/config1 ->f..t...... foo/config2 -hf foo/extra -.L foo/sym -> ../bar/baz/rsync +.d$allspace ./ +.d$allspace bar/ +.d$allspace bar/baz/ +.f...p$dots bar/baz/rsync +.d$allspace foo/ +.f$allspace foo/config1 +>f..t.$dots foo/config2 +hf$allspace foo/extra +.L$allspace foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed" @@ -149,8 +149,8 @@ touch "$todir/foo/config2" $RSYNC -iplrtH "$fromdir/" "$todir/" \ | tee "$outfile" cat <"$chkfile" -.f...p..... foo/config1 ->f..t...... foo/config2 +.f...p$dots foo/config1 +>f..t.$dots foo/config2 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed" @@ -159,28 +159,28 @@ $RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \ filter_outfile case `tail -1 "$outfile"` in cL..t*) - sym_dots='..t......' - L_sym_dots='cL..t......' + sym_dots="..t.$dots" + L_sym_dots="cL$sym_dots" is_uptodate='-> ../bar/baz/rsync' echo "cL$sym_dots foo/sym $is_uptodate" >"$chkfile.extra" L=cL ;; *) - sym_dots=' ' - L_sym_dots='.L ' + sym_dots="$allspace" + L_sym_dots=".L$allspace" is_uptodate='is uptodate' touch "$chkfile.extra" ;; esac cat <"$chkfile" -cd ./ -cd bar/ -cd bar/baz/ -cf bar/baz/rsync -cd foo/ -cf foo/config1 -cf foo/config2 -hf foo/extra => foo/config1 +cd$allspace ./ +cd$allspace bar/ +cd$allspace bar/baz/ +cf$allspace bar/baz/rsync +cd$allspace foo/ +cf$allspace foo/config1 +cf$allspace foo/config2 +hf$allspace foo/extra => foo/config1 cL$sym_dots foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed" @@ -189,7 +189,7 @@ rm -rf "$to2dir" $RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \ | tee "$outfile" cat - "$chkfile.extra" <"$chkfile" -hf foo/extra => foo/config1 +hf$allspace foo/extra => foo/config1 EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed" @@ -215,14 +215,14 @@ $RSYNC -ivvplrtH --link-dest="$todir" "$fromdir/" "$to2dir/" \ | tee "$outfile" filter_outfile cat <"$chkfile" -cd ./ -cd bar/ -cd bar/baz/ -hf bar/baz/rsync -cd foo/ -hf foo/config1 -hf foo/config2 -hf foo/extra => foo/config1 +cd$allspace ./ +cd$allspace bar/ +cd$allspace bar/baz/ +hf$allspace bar/baz/rsync +cd$allspace foo/ +hf$allspace foo/config1 +hf$allspace foo/config2 +hf$allspace foo/extra => foo/config1 $L$sym_dots foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed" @@ -263,14 +263,14 @@ $RSYNC -ivvplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \ | tee "$outfile" filter_outfile cat <"$chkfile" -cd ./ -cd bar/ -cd bar/baz/ -.f bar/baz/rsync -cd foo/ -.f foo/config1 -.f foo/config2 -.f foo/extra +cd$allspace ./ +cd$allspace bar/ +cd$allspace bar/baz/ +.f$allspace bar/baz/rsync +cd$allspace foo/ +.f$allspace foo/config1 +.f$allspace foo/config2 +.f$allspace foo/extra $L_sym_dots foo/sym -> ../bar/baz/rsync EOT diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed" diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index ac7920da..de628665 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -23,6 +23,11 @@ fromdir="$tmpdir/from" todir="$tmpdir/to" chkdir="$tmpdir/chk" +# For itemized output: +all_plus='+++++++++' +allspace=' ' +dots='.....' # trailing dots after changes + # Berkley's nice. PATH="$PATH:/usr/ucb"