Test 105 was broken on IRIX because there is no setfacl cmd in IRIX.

Merge of master-melb:xfs-cmds:25919a by kenmcd.

  Test now checks HOSTOS and runs setfacl for linux and chacl for IRIX. Also removed the group ($4) column in the ls -l cmd because IRIX reports the group 'sys' but Linux reports the group as 'root'. This detail was not needed for the test.
This commit is contained in:
Andrew Jones
2006-05-12 06:06:04 +00:00
parent f87d14c2ac
commit 0e183a3032
2 changed files with 13 additions and 6 deletions
+11 -4
View File
@@ -7,7 +7,7 @@
# which pulls out an earlier mod # which pulls out an earlier mod
# #
#----------------------------------------------------------------------- #-----------------------------------------------------------------------
# Copyright (c) 2000-2004 Silicon Graphics, Inc. All Rights Reserved. # Copyright (c) 2000-2006 Silicon Graphics, Inc. All Rights Reserved.
#----------------------------------------------------------------------- #-----------------------------------------------------------------------
# #
# creator # creator
@@ -62,15 +62,22 @@ chown $acl1 subdir
# put a file in the directory # put a file in the directory
echo data > subdir/file echo data > subdir/file
ls -l subdir/file | awk '{ print $1, $3, $4 }' ls -l subdir/file | awk '{ print $1, $3 }'
# add an ACL with a user ACE which has no exec permission # add an ACL with a user ACE which has no exec permission
setfacl -m u:$acl1:r subdir if [ "$HOSTOS" == "Linux" ]; then
setfacl -m u:$acl1:r subdir
elif [ "$HOSTOS" == "IRIX" ]; then
chacl u:$acl:r--,g::---,o::--- subdir
else
echo "Unknown OS!"
exit 1
fi
# With the bug this gives: `ls: subdir/file: Permission denied' # With the bug this gives: `ls: subdir/file: Permission denied'
# because one needs at least an exec perm somewhere in acl # because one needs at least an exec perm somewhere in acl
# However, this should not hold true for directories. # However, this should not hold true for directories.
ls -l subdir/file | awk '{ print $1, $3, $4 }' ls -l subdir/file | awk '{ print $1, $3 }'
# With the bug this gives: `subdir/file2: Permission denied'. # With the bug this gives: `subdir/file2: Permission denied'.
echo data2 > subdir/file2 echo data2 > subdir/file2
+2 -2
View File
@@ -1,3 +1,3 @@
QA output created by 105 QA output created by 105
-rw-r--r-- root root -rw-r--r-- root
-rw-r--r-- root root -rw-r--r-- root