Skip to content

L
liblongpath-rsync
Commit 8af1bc90 authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

- Added a comment to the filter_outfile function. 

- Twiddled where the calls to filter_outfile happen.
parent 6a12f0d6
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
testsuite/itemize.test
View file @ 8af1bc90
...@@ -17,6 +17,8 @@ lddir="$tmpdir/ld" ...@@ -17,6 +17,8 @@ lddir="$tmpdir/ld"
chkfile="$scratchdir/rsync.chk" chkfile="$scratchdir/rsync.chk"
outfile="$scratchdir/rsync.out" outfile="$scratchdir/rsync.out"
# This is only called if rsync was run with -v or -vv (not -i alone).
# Higher levels of -v would require more filtering.
filter_outfile() { filter_outfile() {
sed -e '/^building file list /d' \ sed -e '/^building file list /d' \
-e '/^created directory /d' \ -e '/^created directory /d' \
...@@ -94,6 +96,7 @@ chmod 600 "$fromdir/foo/config2" ...@@ -94,6 +96,7 @@ chmod 600 "$fromdir/foo/config2"
# Lack of -t is for unchanged hard-link stress-test! # Lack of -t is for unchanged hard-link stress-test!
$RSYNC -vvplrH "$fromdir/" "$todir/" \ $RSYNC -vvplrH "$fromdir/" "$todir/" \
| tee "$outfile" | tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile" cat <<EOT >"$chkfile"
bar/baz/rsync is uptodate bar/baz/rsync is uptodate
foo/config1 is uptodate foo/config1 is uptodate
...@@ -101,13 +104,13 @@ foo/config2 ...@@ -101,13 +104,13 @@ foo/config2
"foo/extra" is a hard link "foo/extra" is a hard link
foo/sym is uptodate foo/sym is uptodate
EOT EOT
filter_outfile
diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed" diff $diffopt "$chkfile" "$outfile" || test_fail "test 4 failed"
chmod 747 "$todir/bar/baz/rsync" chmod 747 "$todir/bar/baz/rsync"
$RSYNC -a -f '-! */' "$fromdir/" "$todir" $RSYNC -a -f '-! */' "$fromdir/" "$todir"
$RSYNC -ivvplrtH "$fromdir/" "$todir/" \ $RSYNC -ivvplrtH "$fromdir/" "$todir/" \
| tee "$outfile" | tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile" cat <<EOT >"$chkfile"
.d ./ .d ./
.d bar/ .d bar/
...@@ -119,17 +122,16 @@ cat <<EOT >"$chkfile" ...@@ -119,17 +122,16 @@ cat <<EOT >"$chkfile"
hf foo/extra hf foo/extra
.L foo/sym -> ../bar/baz/rsync .L foo/sym -> ../bar/baz/rsync
EOT EOT
filter_outfile
diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed" diff $diffopt "$chkfile" "$outfile" || test_fail "test 5 failed"
chmod 757 "$todir/foo/config1" chmod 757 "$todir/foo/config1"
touch "$todir/foo/config2" touch "$todir/foo/config2"
$RSYNC -vplrtH "$fromdir/" "$todir/" \ $RSYNC -vplrtH "$fromdir/" "$todir/" \
| tee "$outfile" | tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile" cat <<EOT >"$chkfile"
foo/config2 foo/config2
EOT EOT
filter_outfile
diff $diffopt "$chkfile" "$outfile" || test_fail "test 6 failed" diff $diffopt "$chkfile" "$outfile" || test_fail "test 6 failed"
chmod 757 "$todir/foo/config1" chmod 757 "$todir/foo/config1"
...@@ -145,6 +147,7 @@ diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed" ...@@ -145,6 +147,7 @@ diff $diffopt "$chkfile" "$outfile" || test_fail "test 7 failed"
mv "$todir" "$lddir" mv "$todir" "$lddir"
$RSYNC -ivvplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \ $RSYNC -ivvplrtH --copy-dest="$lddir" "$fromdir/" "$todir/" \
| tee "$outfile" | tee "$outfile"
filter_outfile
cat <<EOT >"$chkfile" cat <<EOT >"$chkfile"
.d..t.... ./ .d..t.... ./
cd+++++++ bar/ cd+++++++ bar/
...@@ -156,7 +159,6 @@ cf....... foo/config2 ...@@ -156,7 +159,6 @@ cf....... foo/config2
hf+++++++ foo/extra => foo/config1 hf+++++++ foo/extra => foo/config1
cL+++++++ foo/sym -> ../bar/baz/rsync cL+++++++ foo/sym -> ../bar/baz/rsync
EOT EOT
filter_outfile
diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed" diff $diffopt "$chkfile" "$outfile" || test_fail "test 8 failed"
rm -rf "$todir" rm -rf "$todir"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment