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.

diff --git a/105 b/105
index 13dd7ea892872867611290e202e42bb5d9725236..cd201dd2ff2d0575dfe0a0ae2ad6e45833dbdd79 100755 (executable)
--- a/105
+++ b/105
@@ -7,7 +7,7 @@
 #   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
@@ -62,15 +62,22 @@ chown $acl1 subdir
 
 # put a file in the directory
 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 
-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'
 # because one needs at least an exec perm somewhere in acl
 # 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'.
 echo data2 > subdir/file2

diff --git a/105.out b/105.out
index 41676b5ab81c56619d3a84ab79fce03b8e02ca18..af18719fbfdf131fd04846604c803bad0cc8df58 100644 (file)
--- a/105.out
+++ b/105.out
@@ -1,3 +1,3 @@
 QA output created by 105
--rw-r--r-- root root
--rw-r--r-- root root
+-rw-r--r-- root
+-rw-r--r-- root