Fix xattrs test on OS X.

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 903bd6ccf5f11ba975fb39a45e4dfaea0fb9f160..fbca1806b08948ff119d30a6c5da466dd48a82d7 100644 (file)
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -27,6 +27,7 @@ chkdir="$tmpdir/chk"
 all_plus='+++++++++'
 allspace='         '
 dots='.....' # trailing dots after changes
+tab_ch='       ' # a single tab character
 
 # Berkley's nice.
 PATH="$PATH:/usr/ucb"

diff --git a/testsuite/xattrs.test b/testsuite/xattrs.test
index b61f56138d215715467463edb77bf1aea73d87dc..97056b7f5022c57128ac1a66503d03ccec218b7e 100644 (file)
--- a/testsuite/xattrs.test
+++ b/testsuite/xattrs.test
@@ -18,8 +18,9 @@ case "`xattr 2>&1`" in
        xattr -s "$xnam" "$xval" "${@}"
     }
     xls() {
-       xattr -l "${@}"
+       xattr -l "${@}" | sed "s/^[ $tab_ch]*//"
     }
+    RSYNC_PREFIX='rsync'
     RUSR='rsync.nonuser'
     ;;
 *)
@@ -32,6 +33,7 @@ case "`xattr 2>&1`" in
     xls() {
        getfattr -d "${@}"
     }
+    RSYNC_PREFIX='user.rsync'
     RUSR='user.rsync'
     ;;
 esac
@@ -125,8 +127,8 @@ cd "$chkdir"
 chmod go-rwx . $dirs $files
 
 xset user.nice 'this is nice, but different' file1
-xset user.rsync.%stat "40000 0,0 $uid_gid" $dirs
-xset user.rsync.%stat "100000 0,0 $uid_gid" $files
+xset $RSYNC_PREFIX.%stat "40000 0,0 $uid_gid" $dirs
+xset $RSYNC_PREFIX.%stat "100000 0,0 $uid_gid" $files
 
 xls $dirs $files >"$scratchdir/xattrs.txt"