Use umask kluge from rsync.fns to try to get rid of a potential

[rsync/rsync.git] / testsuite / itemize.test

diff --git a/testsuite/itemize.test b/testsuite/itemize.test
index aba265a..563bda9 100644 (file)
--- a/testsuite/itemize.test
+++ b/testsuite/itemize.test
@@ -24,7 +24,9 @@ cp -p "$srcdir/config.h" "$fromdir/foo/config1"
 cp -p "$srcdir/config.h.in" "$fromdir/foo/config2"
 cp -p "$srcdir/rsync.h" "$fromdir/bar/baz/rsync"
 chmod 600 "$fromdir"/foo/config? "$fromdir/bar/baz/rsync"
+umask 0
 ln -s ../bar/baz/rsync "$fromdir/foo/sym"
+umask 022
 ln "$fromdir/foo/config1" "$fromdir/foo/extra"
 
 $RSYNC -iplr "$fromdir/" "$todir/" \
@@ -76,7 +78,7 @@ cp -p "$srcdir/config.h" "$fromdir/foo/config2"
 chmod 600 "$fromdir/foo/config2"
 # Lack of -t is for unchanged hard-link stress-test!
 $RSYNC -vvplrH "$fromdir/" "$todir/" \
-    | sed -e '0,/done$/d' -e '/--whole-file/d' -e '/total:/d' -e '/^$/,$d' \
+    | sed -e '1,/done$/d' -e '/--whole-file/d' -e '/total:/d' -e '/^$/,$d' \
     | tee "$outfile"
 cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 4 failed"
 bar/baz/rsync is uptodate
@@ -106,7 +108,7 @@ EOT
 chmod 757 "$todir/foo/config1"
 touch "$todir/foo/config2"
 $RSYNC -vplrtH "$fromdir/" "$todir/" \
-    | sed -e '0,/done$/d' -e '/^$/,$d' \
+    | sed -e '/done$/d' -e '/^$/,$d' \
     | tee "$outfile"
 cat <<EOT | diff $diffopt - "$outfile" || test_fail "test 6 failed"
 foo/config2