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
Fixed a problem with duplicate dirs being unduplicated in the list:
[rsync/rsync.git]
/
testsuite
/
itemize.test
diff --git
a/testsuite/itemize.test
b/testsuite/itemize.test
index
a165fa1
..
6a5737d
100644
(file)
--- a/
testsuite/itemize.test
+++ b/
testsuite/itemize.test
@@
-10,15
+10,6
@@
. "$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"
@@
-46,17
+37,16
@@
rm -f "$to2dir" "$to2dir.test"
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
$RSYNC -iplr "$fromdir/" "$todir/" \
| tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-cd+++++++ ./
-cd+++++++ bar/
-cd+++++++ foo/_P30_
-cd+++++++ bar/baz/
->f+++++++ bar/baz/rsync
-cd+++++++ foo/_P29_
->f+++++++ foo/config1
->f+++++++ foo/config2
->f+++++++ foo/extra
-cL+++++++ foo/sym -> ../bar/baz/rsync
+cat <<EOT >"$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
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 1 failed"
@@
-67,11
+57,11
@@
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"
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
->f..T.... bar/baz/rsync
->f..T.... foo/config1
->f.sTp... foo/config2
-hf..T.... foo/extra => foo/config1
+
cat
<<EOT >"$chkfile"
+>f..T....
..
bar/baz/rsync
+>f..T....
..
foo/config1
+>f.sTp...
..
foo/config2
+hf..T....
..
foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 2 failed"
@@
-87,13
+77,12
@@
chmod 777 "$todir/bar/baz/rsync"
$RSYNC -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
$RSYNC -iplrtc "$fromdir/" "$todir/" \
| tee "$outfile"
-sed -e "$sed_cmd" <<EOT >"$chkfile"
-.d..t.... foo/_P30_
-.f..tp... bar/baz/rsync
-.d..t.... foo/_P29_
-.f..t.... foo/config1
->fcstp... foo/config2
-cL..T.... foo/sym -> ../bar/baz/rsync
+cat <<EOT >"$chkfile"
+.f..tp..... bar/baz/rsync
+.d..t...... foo/
+.f..t...... foo/config1
+>fcstp..... foo/config2
+cL..T...... foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 3 failed"
@@
-103,7
+92,7
@@
chmod 600 "$fromdir/foo/config2"
$RSYNC -vvplrH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
$RSYNC -vvplrH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+
cat
<<EOT >"$chkfile"
bar/baz/rsync is uptodate
foo/config1 is uptodate
foo/config2
bar/baz/rsync is uptodate
foo/config1 is uptodate
foo/config2
@@
-117,16
+106,16
@@
$RSYNC -a -f '-! */' "$fromdir/" "$todir"
$RSYNC -ivvplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
$RSYNC -ivvplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
-
sed -e "$sed_cmd"
<<EOT >"$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
+
cat
<<EOT >"$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
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
@@
-135,7
+124,7
@@
touch "$todir/foo/config2"
$RSYNC -vplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
$RSYNC -vplrtH "$fromdir/" "$todir/" \
| tee "$outfile"
filter_outfile
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+
cat
<<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"
@@
-144,33
+133,33
@@
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"
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
-.f...p... foo/config1
->f..t.... foo/config2
+
cat
<<EOT >"$chkfile"
+.f...p...
..
foo/config1
+>f..t....
..
foo/config2
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
$RSYNC -ivvplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
filter_outfile
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
-cd ./
-cd bar/
-cd bar/baz/
-cf bar/baz/rsync
-cd foo/
-cf foo/config1
-cf foo/config2
-hf foo/extra => foo/config1
-cL foo/sym -> ../bar/baz/rsync
+
cat
<<EOT >"$chkfile"
+cd
./
+cd
bar/
+cd
bar/baz/
+cf
bar/baz/rsync
+cd
foo/
+cf
foo/config1
+cf
foo/config2
+hf
foo/extra => foo/config1
+cL
foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --copy-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
-hf foo/extra => foo/config1
+
cat
<<EOT >"$chkfile"
+hf
foo/extra => foo/config1
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 9 failed"
@@
-178,7
+167,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
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+
cat
<<EOT >"$chkfile"
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
@@
-195,30
+184,30
@@
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
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
-cd ./
-cd bar/
-cd bar/baz/
-hf bar/baz/rsync
-cd foo/
-hf foo/config1
-hf foo/config2
-hf foo/extra => foo/config1
-$L foo/sym -> ../bar/baz/rsync
+
cat
<<EOT >"$chkfile"
+cd
./
+cd
bar/
+cd
bar/baz/
+hf
bar/baz/rsync
+cd
foo/
+hf
foo/config1
+hf
foo/config2
+hf
foo/extra => foo/config1
+$L
foo/sym -> ../bar/baz/rsync
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --dry-run --link-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 11 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --dry-run --link-dest=../to "$fromdir/" "$to2dir/" \
| tee "$outfile"
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+
cat
<<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"
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+
cat
<<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 13 failed"
@@
-226,7
+215,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
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+
cat
<<EOT >"$chkfile"
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
@@
-243,23
+232,23
@@
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
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
-cd ./
-cd bar/
-cd bar/baz/
-.f bar/baz/rsync
-cd foo/
-.f foo/config1
-.f foo/config2
-.f foo/extra
-.L foo/sym -> ../bar/baz/rsync
+
cat
<<EOT >"$chkfile"
+cd
./
+cd
bar/
+cd
bar/baz/
+.f
bar/baz/rsync
+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"
rm -rf "$to2dir"
$RSYNC -iplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 15 failed"
rm -rf "$to2dir"
$RSYNC -iplrtH --compare-dest="$todir" "$fromdir/" "$to2dir/" \
| tee "$outfile"
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+
cat
<<EOT >"$chkfile"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed"
EOT
diff $diffopt "$chkfile" "$outfile" || test_fail "test 16 failed"
@@
-267,7
+256,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
-
sed -e "$sed_cmd"
<<EOT >"$chkfile"
+
cat
<<EOT >"$chkfile"
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate
./ is uptodate
bar/ is uptodate
bar/baz/ is uptodate