diff options
| author | Wayne Davison <wayned@samba.org> | 2011-03-13 20:42:58 -0700 |
|---|---|---|
| committer | Wayne Davison <wayned@samba.org> | 2011-03-13 20:48:18 -0700 |
| commit | 0b67d5e396f54dc07fad3a22b05921d4f00768fc (patch) | |
| tree | 3af88a92ecedd7c6aa52092a5db75f53fbd7b695 /testsuite | |
| parent | d52aeae4e9af689aed4ae6af2b7602552c1383e7 (diff) | |
| download | android_external_rsync-0b67d5e396f54dc07fad3a22b05921d4f00768fc.tar.gz android_external_rsync-0b67d5e396f54dc07fad3a22b05921d4f00768fc.tar.bz2 android_external_rsync-0b67d5e396f54dc07fad3a22b05921d4f00768fc.zip | |
Fix xattrs test on OS X.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/rsync.fns | 1 | ||||
| -rw-r--r-- | testsuite/xattrs.test | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns index 7ea2a9c4..ca05297f 100644 --- a/testsuite/rsync.fns +++ b/testsuite/rsync.fns @@ -26,6 +26,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 f754d004..7200f250 100644 --- 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" |