acl test scripts: remove user substitution; remove obsolete files.

diff --git a/lustre/tests/acl_asroot.test b/lustre/tests/acl_asroot.test
deleted file mode 100644 (file)
index af0fed3..0000000
--- a/lustre/tests/acl_asroot.test
+++ /dev/null
@@ -1,46 +0,0 @@
-!
-! Test that can only be run as root as it uses mknod.
-!
-$mkdir asroot
-$ umask 027
-$ mknod asroot/null c 1 3
-$ acl_mode asroot/null
-crw-r-----
-$ setfacl -m u:joe:rw,u:lisa:- asroot/null
-$ acl_mode asroot/null
-crw-rw----+
-$ setfacl -m u:lisa:r asroot/null
-$ getfacl --omit-header asroot/null
-user::rw-
-user:joe:rw-
-user:lisa:r--
-group::r--
-mask::rw-
-other::---
-
-$ su - lisa -c chmod\ +rw\ /mnt/lustre/asroot/null
-chmod: changing permissions of `/mnt/lustre/asroot/null': Operation not permitted
-$ rm -f asroot/null
-$ mkfifo asroot/fifo
-$ acl_mode asroot/fifo
-prw-r-----
-$ setfacl -m u:joe:- asroot/fifo
-$ getfacl --omit-header asroot/fifo
-user::rw-
-user:joe:---
-group::r--
-mask::r--
-other::---
-
-$ rm asroot/fifo
-$ mknod asroot/block b 1 1
-$ setfacl -m u:joe:- asroot/block
-$ getfacl --omit-header asroot/block
-user::rw-
-user:joe:---
-group::r--
-mask::r--
-other::---
-
-$ rm asroot/block
-$ rmdir asroot

diff --git a/lustre/tests/acl_fileutil.test b/lustre/tests/acl_fileutil.test
deleted file mode 100644 (file)
index 9760bf4..0000000
--- a/lustre/tests/acl_fileutil.test
+++ /dev/null
@@ -1,66 +0,0 @@
-!
-! Test for the patched file utilities.
-!
-$ umask 022
-$ mkdir dir
-$ acl_mode dir
-drwxr-xr-x
-$ touch dir/f
-$ getfacl --omit-header dir/f
-user::rw-
-group::r--
-other::r--
-
-$ umask 027
-$ cp -p dir/f dir/g
-$ getfacl --omit-header dir/g
-user::rw-
-group::r--
-other::r--
-
-$ rm dir/g
-$ cp dir/f dir/g
-$ getfacl --omit-header dir/g
-user::rw-
-group::r--
-other::---
-
-$ setfacl -m u::rwx,u:joe:rwx,g::rwx,o::r-x dir/.
-$ setfacl -dm u::rwx,u:joe:rwx,g::rwx,o::r-x dir/.
-$ acl_mode dir
-drwxrwxr-x+
-$ touch dir/h
-$ getfacl --omit-header --no-effective dir/h
-user::rw-
-user:joe:rwx
-group::rwx
-mask::r--
-other::---
-
-$ mkdir dir/d
-$ getfacl --omit-header --no-effective dir/d
-user::rwx
-user:joe:rwx
-group::rwx
-mask::r-x
-other::---
-default:user::rwx
-default:user:joe:rwx
-default:group::rwx
-default:mask::rwx
-default:other::r-x
-
-$ cp dir/f dir/i
-$ getfacl --omit-header --no-effective dir/i
-user::rw-
-user:joe:rwx
-group::rwx
-mask::r--
-other::---
-
-$ acl_mode dir/f
--rw-r--r--
-$ cp -p dir/f dir/j
-$ acl_mode dir/j
--rw-r--r--
-$ rm -r dir

diff --git a/lustre/tests/acl_misc.test b/lustre/tests/acl_misc.test
deleted file mode 100644 (file)
index def2929..0000000
--- a/lustre/tests/acl_misc.test
+++ /dev/null
@@ -1,386 +0,0 @@
-!
-! Pretty comprehensive ACL tests.
-!
-! This must be run on a filesystem with ACL support. Also, you will need
-! two dummy users (lisa and joe) and a dummy group (toolies).
-!
-$ umask 027
-$ touch f
-! Only change a base ACL:
-$ setfacl -m u::r f
-$ setfacl -m u::rw,u:lisa:rw f
-$ acl_mode f
--rw-rw----+
-$ getfacl --omit-header f
-user::rw-
-user:lisa:rw-
-group::r--
-mask::rw-
-other::---
-
-$ rm f
-$ umask 022
-$ touch f
-$ setfacl -m u:lisa:rw f
-$ acl_mode f
--rw-rw-r--+
-$ getfacl --omit-header f
-user::rw-
-user:lisa:rw-
-group::r--
-mask::rw-
-other::r--
-
-$rm f
-$ umask 027
-$ mkdir d
-$ setfacl -m u:lisa:rwx d
-$ acl_mode d
-drwxrwx---+
-$ getfacl --omit-header d
-user::rwx
-user:lisa:rwx
-group::r-x
-mask::rwx
-other::---
-
-$ rmdir d
-$ umask 022
-$ mkdir d
-$ setfacl -m u:lisa:rwx d
-$ acl_mode d
-drwxrwxr-x+
-$ getfacl --omit-header d
-user::rwx
-user:lisa:rwx
-group::r-x
-mask::rwx
-other::r-x
-
-$ rmdir d
-!
-! Multiple users
-!
-$ umask 022
-$ touch f
-$ setfacl -m u:lisa:rw,u:joe:r f
-$ acl_mode f
--rw-rw-r--+
-$ getfacl --omit-header f
-user::rw-
-user:joe:r--
-user:lisa:rw-
-group::r--
-mask::rw-
-other::r--
-
-!
-! Multiple groups
-!
-$ setfacl -m g:users:rw,g:toolies:r f
-$ acl_mode f
--rw-rw-r--+
-$ getfacl --omit-header f
-user::rw-
-user:joe:r--
-user:lisa:rw-
-group::r--
-group:users:rw-
-group:toolies:r--
-mask::rw-
-other::r--
-
-!
-! Remove one group
-!
-$ setfacl -x g:users f
-$ acl_mode f
--rw-rw-r--+
-$ getfacl --omit-header f
-user::rw-
-user:joe:r--
-user:lisa:rw-
-group::r--
-group:toolies:r--
-mask::rw-
-other::r--
-
-!
-! Remove one user
-!
-$ setfacl -x u:joe f
-$ acl_mode f
--rw-rw-r--+
-$ getfacl --omit-header f
-user::rw-
-user:lisa:rw-
-group::r--
-group:toolies:r--
-mask::rw-
-other::r--
-
-$ rm f
-!
-! Default ACL
-!
-$ umask 027
-$ mkdir d
-$ setfacl -m u:lisa:rwx,u:joe:rw,d:u:lisa:rwx,d:m:rx d
-$ acl_mode d
-drwxrwx---+
-$ getfacl --omit-header d
-user::rwx
-user:joe:rw-
-user:lisa:rwx
-group::r-x
-mask::rwx
-other::---
-default:user::rwx
-default:user:lisa:rwx  #effective:r-x
-default:group::r-x
-default:mask::r-x
-default:other::---
-
-!
-! Umask now ignored?
-!
-$ umask 027
-$ touch d/f
-$ acl_mode d/f
--rw-r-----+
-$ getfacl --omit-header d/f
-user::rw-
-user:lisa:rwx  #effective:r--
-group::r-x     #effective:r--
-mask::r--
-other::---
-
-$ rm d/f
-$ umask 022
-$ touch d/f
-$ acl_mode d/f
--rw-r-----+
-$ getfacl --omit-header d/f
-user::rw-
-user:lisa:rwx  #effective:r--
-group::r-x     #effective:r--
-mask::r--
-other::---
-
-$ rm d/f
-!
-! Default ACL copying
-!
-$ umask 000
-$ mkdir d/d
-$ acl_mode d/d
-drwxr-x---+
-$ getfacl --omit-header d/d
-user::rwx
-user:lisa:rwx  #effective:r-x
-group::r-x
-mask::r-x
-other::---
-default:user::rwx
-default:user:lisa:rwx  #effective:r-x
-default:group::r-x
-default:mask::r-x
-default:other::---
-
-$ rmdir d/d
-$ umask 022
-$ mkdir d/d
-$ acl_mode d/d
-drwxr-x---+
-$ getfacl --omit-header d/d
-user::rwx
-user:lisa:rwx  #effective:r-x
-group::r-x
-mask::r-x
-other::---
-default:user::rwx
-default:user:lisa:rwx  #effective:r-x
-default:group::r-x
-default:mask::r-x
-default:other::---
-
-!
-! Add some users and groups
-!
-$ setfacl -nm u:joe:rx,d:u:joe:rx,g:users:rx,g:toolies:rwx d/d
-$ acl_mode d/d
-drwxr-x---+
-$ getfacl --omit-header d/d
-user::rwx
-user:joe:r-x
-user:lisa:rwx  #effective:r-x
-group::r-x
-group:users:r-x
-group:toolies:rwx      #effective:r-x
-mask::r-x
-other::---
-default:user::rwx
-default:user:joe:r-x
-default:user:lisa:rwx  #effective:r-x
-default:group::r-x
-default:mask::r-x
-default:other::---
-
-!
-! symlink in directory with default ACL?
-!
-$ ln -s d d/l
-$ acl_mode d/l
-lrwxrwxrwx
-$ acl_mode -L d/l
-drwxr-x---+
-$ getfacl --omit-header d/l
-user::rwx
-user:joe:r-x
-user:lisa:rwx  #effective:r-x
-group::r-x
-group:users:r-x
-group:toolies:rwx      #effective:r-x
-mask::r-x
-other::---
-default:user::rwx
-default:user:joe:r-x
-default:user:lisa:rwx  #effective:r-x
-default:group::r-x
-default:mask::r-x
-default:other::---
-
-$ rm d/l
-!
-! Does mask manipulation work?
-!
-$ setfacl -m g:toolies:rx,u:lisa:rx d/d
-$ acl_mode d/d
-drwxr-x---+
-$ getfacl --omit-header d/d
-user::rwx
-user:joe:r-x
-user:lisa:r-x
-group::r-x
-group:users:r-x
-group:toolies:r-x
-mask::r-x
-other::---
-default:user::rwx
-default:user:joe:r-x
-default:user:lisa:rwx  #effective:r-x
-default:group::r-x
-default:mask::r-x
-default:other::---
-
-$ setfacl -m d:u:lisa:rwx d/d
-$ acl_mode d/d
-drwxr-x---+
-$ getfacl --omit-header d/d
-user::rwx
-user:joe:r-x
-user:lisa:r-x
-group::r-x
-group:users:r-x
-group:toolies:r-x
-mask::r-x
-other::---
-default:user::rwx
-default:user:joe:r-x
-default:user:lisa:rwx
-default:group::r-x
-default:mask::rwx
-default:other::---
-
-$ rmdir d/d
-!
-! Remove the default ACL
-!
-$ setfacl -k d
-$ acl_mode d
-drwxrwx---+
-$ getfacl --omit-header d
-user::rwx
-user:joe:rw-
-user:lisa:rwx
-group::r-x
-mask::rwx
-other::---
-
-!
-! Reset to base entries
-!
-$ setfacl -b d
-$ acl_mode d
-drwxr-x---
-$ getfacl --omit-header d
-user::rwx
-group::r-x
-other::---
-
-!
-! Now, chmod should change the group_obj entry
-!
-$ chmod 775 d
-$ acl_mode d
-drwxrwxr-x
-$ getfacl --omit-header d
-user::rwx
-group::rwx
-other::r-x
-
-$ rmdir d
-$ umask 002
-$ mkdir d
-$ setfacl -m u:joe:rwx,u:lisa:rx,d:u:joe:rwx,d:u:lisa:rx d
-$ acl_mode d
-drwxrwxr-x+
-$ getfacl --omit-header d
-user::rwx
-user:joe:rwx
-user:lisa:r-x
-group::rwx
-mask::rwx
-other::r-x
-default:user::rwx
-default:user:joe:rwx
-default:user:lisa:r-x
-default:group::rwx
-default:mask::rwx
-default:other::r-x
-
-$ chmod 750 d
-$ acl_mode d
-drwxr-x---+
-$ getfacl --omit-header d
-user::rwx
-user:joe:rwx   #effective:r-x
-user:lisa:r-x
-group::rwx     #effective:r-x
-mask::r-x
-other::---
-default:user::rwx
-default:user:joe:rwx
-default:user:lisa:r-x
-default:group::rwx
-default:mask::rwx
-default:other::r-x
-
-$ chmod 750 d
-$ acl_mode d
-drwxr-x---+
-$ getfacl --omit-header d
-user::rwx
-user:joe:rwx   #effective:r-x
-user:lisa:r-x
-group::rwx     #effective:r-x
-mask::r-x
-other::---
-default:user::rwx
-default:user:joe:rwx
-default:user:lisa:r-x
-default:group::rwx
-default:mask::rwx
-default:other::r-x
-
-$ rmdir d

diff --git a/lustre/tests/acl_mode b/lustre/tests/acl_mode
deleted file mode 100755 (executable)
index af4b5eb..0000000
--- a/lustre/tests/acl_mode
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-ls -dl $* | awk -- '!/^total/ { print $1; }'

diff --git a/lustre/tests/acl_perm.test b/lustre/tests/acl_perm.test
deleted file mode 100644 (file)
index 0e79724..0000000
--- a/lustre/tests/acl_perm.test
+++ /dev/null
@@ -1,18 +0,0 @@
-!
-! Test whether ACL permissions work
-!
-$ umask 022
-$ mkdir dir
-$ umask 077
-$ touch dir/file
-$ setfacl -m u:joe:rw,u:lisa:- dir/file
-$ su - lisa -c cat\ /mnt/lustre/dir/file
-cat: /mnt/lustre/dir/file: Permission denied
-$ su - joe -c cat\ /mnt/lustre/dir/file
-$ su - joe -c touch\ /mnt/lustre/dir/file
-$ cat dir/file
-$ setfacl -m g:users:-  dir/file
-$ su - nobody -c cat\ /mnt/lustre/dir/file
-cat: /mnt/lustre/dir/file: Permission denied
-$ rm dir/file
-$ rmdir dir

diff --git a/lustre/tests/sanity-sec.sh b/lustre/tests/sanity-sec.sh
index fbc8229..a0e863c 100644 (file)
--- a/lustre/tests/sanity-sec.sh
+++ b/lustre/tests/sanity-sec.sh
@@ -302,25 +302,19 @@ run_test 2 "set/get xattr test (trusted xattr only) ============"
 
 run_acl_subtest()
 {
-    sed -e "s/joe/$USER1/g;s/lisa/$USER2/g;s/users/$GROUP1/g;s/toolies/$GROUP2/g" \
-        $SAVE_PWD/acl/$1.test | $SAVE_PWD/acl/run || error "$? $1.test failed"
+    $SAVE_PWD/acl/run $SAVE_PWD/acl/$1.test
+    return $?
 }
 
 test_3 () {
         SAVE_UMASK=`umask`
-        umask 022
-        USER1=rpm
-        USER2=vsx2
-        GROUP1=nobody
-        GROUP2=users
-
         cd $DIR
 
-        run_acl_subtest cp
-        run_acl_subtest getfacl-noacl
-        run_acl_subtest misc
-        run_acl_subtest permissions
-        run_acl_subtest setfacl
+        run_acl_subtest cp || return 1
+        run_acl_subtest getfacl-noacl || return 2
+        run_acl_subtest misc || return 3
+        run_acl_subtest permissions || return 4
+        run_acl_subtest setfacl || return 5
 
         cd $SAVED_PWD
         umask $SAVE_UMASK