Commit c0801903 authored by Wayne Davison's avatar Wayne Davison

Fixed the latest xattrs tests on OS X.

parent 26f0e565
...@@ -20,7 +20,7 @@ case "`xattr 2>&1`" in ...@@ -20,7 +20,7 @@ case "`xattr 2>&1`" in
xls() { xls() {
xattr -l "${@}" xattr -l "${@}"
} }
RUSR='rsync' RUSR='rsync.nonuser'
;; ;;
*) *)
xset() { xset() {
...@@ -78,14 +78,14 @@ xset $RUSR.equal 'this long attribute should remain the same and not need to be ...@@ -78,14 +78,14 @@ xset $RUSR.equal 'this long attribute should remain the same and not need to be
xls $files >"$scratchdir/xattrs.txt" xls $files >"$scratchdir/xattrs.txt"
# OK, let's try a simple xattr copy. # OK, let's try a simple xattr copy.
checkit "$RSYNC -avX . '$chkdir/'" "$fromdir" "$chkdir" checkit "$RSYNC -avX --super . '$chkdir/'" "$fromdir" "$chkdir"
cd "$chkdir" cd "$chkdir"
xls $files | diff $diffopt "$scratchdir/xattrs.txt" - xls $files | diff $diffopt "$scratchdir/xattrs.txt" -
cd "$fromdir" cd "$fromdir"
checkit "$RSYNC -aiX --copy-dest=../chk . ../to" "$fromdir" "$todir" checkit "$RSYNC -aiX --super --copy-dest=../chk . ../to" "$fromdir" "$todir"
cd "$todir" cd "$todir"
xls $files | diff $diffopt "$scratchdir/xattrs.txt" - xls $files | diff $diffopt "$scratchdir/xattrs.txt" -
...@@ -102,7 +102,7 @@ checkit "$RSYNC -aiX --fake-super --link-dest=../chk . ../to" "$chkdir" "$todir" ...@@ -102,7 +102,7 @@ checkit "$RSYNC -aiX --fake-super --link-dest=../chk . ../to" "$chkdir" "$todir"
cd "$todir" cd "$todir"
xls $files | diff $diffopt "$scratchdir/xattrs.txt" - xls $files | diff $diffopt "$scratchdir/xattrs.txt" -
sed -n -e '/\.\/file1$/d' -e '/^[^ ]* *[^ ]* *[^ ]* *1 /p' "$scratchdir/ls-to" >"$scratchdir/ls-diff" sed -n -e '/\.\/file1$/d' -e '/^[^ ][^ ]* *[^ ][^ ]* *[^ ][^ ]* *1 /p' "$scratchdir/ls-to" >"$scratchdir/ls-diff"
if [ -s "$scratchdir/ls-diff" ]; then if [ -s "$scratchdir/ls-diff" ]; then
echo "Missing hard links on:" echo "Missing hard links on:"
cat "$scratchdir/ls-diff" cat "$scratchdir/ls-diff"
......
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