Fixed merge problems

057

@@ -1,7 +1,7 @@
 #! /bin/sh
-# XFS QA Test No. 057
+# FS QA Test No. 057
 #
-# Test out the different acl_get semantics
+# Place holder for test 075. Test out the different acl_get semantics
 #
 #-----------------------------------------------------------------------
 # Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
@@ -38,92 +38,33 @@
 # creator
 owner=tes@sgi.com
 
-# get standard environment, filters and checks
-. ./common.rc
-. ./common.filter
-. ./common.attr
-
 seq=`basename $0`
 echo "QA output created by $seq"
 
-_cleanup()
-{
-    rm -f $tmp.*
-    rm -rf $TEST_DIR/$seq.dir1
-}
-
 here=`pwd`
 tmp=/tmp/$$
 status=1	# failure is the default!
-trap "_cleanup; exit \$status" 0 1 2 3 15
+trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 
-acl_get=$here/src/acl_get
+# get standard environment, filters and checks
+. ./common.rc
+. ./common.filter
 
-_get_file()
-{
-    _file=$1
-
-    ls -ln $_file | awk '{ print $1, $3, $4, $NF }'
-    echo ""
-
-    echo "access, default, irix-semantics"
-    $acl_get -adi $_file
-    echo ""
-
-    echo "access, default, linux-semantics"
-    $acl_get -ad $_file
-    echo ""
-
-    echo "access, fd, irix-semantics"
-    $acl_get -afi $_file
-    echo ""
-
-    echo "access, fd, linux-semantics"
-    $acl_get -af $_file
-    echo ""
-}
-
-_acl_on()
-{
-    # test if acl_get syscall is operational
-    # and hence the ACL config has been turned on  
-    touch syscalltest
-    if $acl_get -l syscalltest 2>&1 | tee -a $here/$seq.full \
-    | grep 'Function not implemented' >/dev/null
-    then
-      cd $here
-      _notrun "requires kernel ACL support"
-    fi
-}
+_notrun "Place holder for IRIX test 057"
 
 # real QA test starts here
-[ `uname` = Linux ] && _notrun "IRIX acl_get semantics no longer required"
-
-rm -f $seq.full
-
-_need_to_be_root
-
-[ -x $acl_get ] || _notrun "$acl_get command not found" 
-[ ! -x /bin/chacl -a ! -x /usr/bin/chacl ] && _notrun "chacl command not found"
-
-# get dir
-cd $TEST_DIR
-rm -rf $seq.dir1
-mkdir $seq.dir1
-cd $seq.dir1
-
-_acl_on
-
-touch file1
-chmod 752 file1
-_get_file file1
-
-# ensure that full blown acls' get/set work, not just minimal ones
-_acl_setup_ids
-chacl u::rwx,g::rw-,o::---,u:$acl1:r-x,g:$acl1:r--,m::rwx file1 2>&1
-chacl -l file1 | _acl_filter_id
-_get_file file1 | _acl_filter_id
+_supported_fs xfs
+_supported_os IRIX
 
 # success, all done
 status=0
 exit
+
+
+
+
+
+
+
+
+