LU-8141 tests: fix for acl test

[fs/lustre-release.git] / lustre / tests / acl / permissions.test

diff --git a/lustre/tests/acl/permissions.test b/lustre/tests/acl/permissions.test
index 04accac..6fc47b3 100644 (file)
--- a/lustre/tests/acl/permissions.test
+++ b/lustre/tests/acl/permissions.test
@@ -20,7 +20,7 @@ defined permissions.
        $ cd d
        $ umask 027
        $ touch f
        $ cd d
        $ umask 027
        $ touch f

-       $ ls -l f | awk -- '{ print $1, $3, $4 }'
+       $ ls -l f | awk -- '{sub(/\\./, "", $1); print $1, $3, $4 }'

        > -rw-r----- root root
 
 
        > -rw-r----- root root
 
 


@@ -40,7 +40,7 @@ Now, change the ownership of the file to bin:bin and verify that this
 gives user bin write access.
 
        $ chown bin:bin f
 gives user bin write access.
 
        $ chown bin:bin f

-       $ ls -l f | awk -- '{ print $1, $3, $4 }'
+       $ ls -l f | awk -- '{sub(/\\./, "", $1); print $1, $3, $4 }'

        > -rw-r----- bin bin
        $ su bin
        $ echo bin >> f
        > -rw-r----- bin bin
        $ su bin
        $ echo bin >> f


@@ -205,8 +205,8 @@ although it pass in FC2. commented out by CFS (agreed with HP)
 Replaced "echo" with "touch" can resolve such problem.
 #      $ echo i > e/i
 #      > e/i: Permission denied
 Replaced "echo" with "touch" can resolve such problem.
 #      $ echo i > e/i
 #      > e/i: Permission denied

-        $ touch e/i
-        > touch: cannot touch `e/i': Permission denied
+        $ touch e/i 2>&1 | sed -e "s/touch .*e\\/i.*:/touch \\'e\\/i\\':/"
+        > touch: cannot touch 'e/i': Permission denied

 
        $ su
        $ setfacl -m u:bin:rwx e
 
        $ su
        $ setfacl -m u:bin:rwx e


@@ -262,12 +262,12 @@ directories if the file has an ACL and only CAP_FOWNER would grant them.
        $ mkdir -m 600 x
        $ chown daemon:daemon x
        $ echo j > x/j
        $ mkdir -m 600 x
        $ chown daemon:daemon x
        $ echo j > x/j

-       $ ls -l x/j | awk -- '{ print $1, $3, $4 }'
+       $ ls -l x/j | awk -- '{sub(/\\./, "", $1); print $1, $3, $4 }'

        > -rw-r----- root root
 
        $ setfacl -m u:daemon:r x
 
        > -rw-r----- root root
 
        $ setfacl -m u:daemon:r x
 

-       $ ls -l x/j | awk -- '{ print $1, $3, $4 }'
+       $ ls -l x/j | awk -- '{sub(/\\./, "", $1); print $1, $3, $4 }'

        > -rw-r----- root root
        (With the bug this gives: `ls: x/j: Permission denied'.)
 
        > -rw-r----- root root
        (With the bug this gives: `ls: x/j: Permission denied'.)