diff options
| author | Wayne Davison <wayned@samba.org> | 2008-03-07 17:13:38 -0800 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2008-03-07 17:13:38 -0800 |
| commit | c080190365fceef2d35ee63f408bba16f09ca112 (patch) | |
| tree | da042c76b2bcf76b25fd90ef20efac8a659603cf /testsuite | |
| parent | 26f0e565879cfbfd90527850f15c7a329b9c8ddc (diff) | |
| download | rsync-c080190365fceef2d35ee63f408bba16f09ca112.tar.gz rsync-c080190365fceef2d35ee63f408bba16f09ca112.tar.bz2 rsync-c080190365fceef2d35ee63f408bba16f09ca112.zip | |
Fixed the latest xattrs tests on OS X.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/xattrs.test | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test index c9904a1f..4f2c6cb3 100644 --- a/testsuite/xattrs.test +++ b/testsuite/xattrs.test @@ -20,7 +20,7 @@ case "`xattr 2>&1`" in xls() { xattr -l "${@}" } - RUSR='rsync' + RUSR='rsync.nonuser' ;; *) xset() { @@ -78,14 +78,14 @@ xset $RUSR.equal 'this long attribute should remain the same and not need to be xls $files >"$scratchdir/xattrs.txt" # OK, let's try a simple xattr copy. -checkit "$RSYNC -avX . '$chkdir/'" "$fromdir" "$chkdir" +checkit "$RSYNC -avX --super . '$chkdir/'" "$fromdir" "$chkdir" cd "$chkdir" xls $files | diff $diffopt "$scratchdir/xattrs.txt" - cd "$fromdir" -checkit "$RSYNC -aiX --copy-dest=../chk . ../to" "$fromdir" "$todir" +checkit "$RSYNC -aiX --super --copy-dest=../chk . ../to" "$fromdir" "$todir" cd "$todir" xls $files | diff $diffopt "$scratchdir/xattrs.txt" - @@ -102,7 +102,7 @@ checkit "$RSYNC -aiX --fake-super --link-dest=../chk . ../to" "$chkdir" "$todir" cd "$todir" 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 echo "Missing hard links on:" cat "$scratchdir/ls-diff" |