diff options
author | Brandon Philips <brandon@ifup.co> | 2013-05-18 21:29:26 -0700 |
---|---|---|
committer | Brandon Philips <brandon@ifup.co> | 2013-05-18 21:29:26 -0700 |
commit | 7f2c91b8369242a8dbc2b304a5b71b2a85f5b855 (patch) | |
tree | fb9f8eda9eb1e6e4ea7aa92a8948d397bfc86c5d | |
parent | 14914c0540c2f73750ab09e347bfa6bc1287a6ba (diff) | |
download | acl-7f2c91b8369242a8dbc2b304a5b71b2a85f5b855.tar.gz |
test: fixups on SELinux machines
ls adds a '.' at the end of the permission field list on SELinux
machines, filter this out so tests work on SELinux machines.
-rw-r--r-- | test/cp.test | 2 | ||||
-rw-r--r-- | test/misc.test | 6 | ||||
-rw-r--r-- | test/sbits-restore.test | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/test/cp.test b/test/cp.test index a888c04..0867f63 100644 --- a/test/cp.test +++ b/test/cp.test @@ -9,7 +9,7 @@ The cp utility should only copy ACLs if `-p' is given. > -rw-rw-r--+ $ cp f g - $ ls -l g | awk -- '{ print $1 }' + $ ls -l g | awk -- '{ print $1 }' | sed 's/\.$//g' > -rw-r--r-- $ rm g diff --git a/test/misc.test b/test/misc.test index eab9d17..6e98053 100644 --- a/test/misc.test +++ b/test/misc.test @@ -254,7 +254,7 @@ Add some users and groups Symlink in directory with default ACL? $ ln -s d d/l - $ ls -dl d/l | awk '{print $1}' + $ ls -dl d/l | awk '{print $1}' | sed 's/\.$//g' > lrwxrwxrwx $ ls -dl -L d/l | awk '{print $1}' @@ -343,7 +343,7 @@ Remove the default ACL Reset to base entries $ setfacl -b d - $ ls -dl d | awk '{print $1}' + $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' > drwxr-x--- $ getfacl --omit-header d @@ -355,7 +355,7 @@ Reset to base entries Now, chmod should change the group_obj entry $ chmod 775 d - $ ls -dl d | awk '{print $1}' + $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' > drwxrwxr-x $ getfacl --omit-header d diff --git a/test/sbits-restore.test b/test/sbits-restore.test index e5e4fb2..de21340 100644 --- a/test/sbits-restore.test +++ b/test/sbits-restore.test @@ -13,10 +13,10 @@ Ensure setting of SUID/SGID/sticky via --restore works $ touch d/g $ touch d/u $ setfacl --restore d.acl - $ ls -dl d | awk '{print $1}' + $ ls -dl d | awk '{print $1}' | sed 's/\.$//g' > drwxr-xr-t - $ ls -dl d/u | awk '{print $1}' + $ ls -dl d/u | awk '{print $1}' | sed 's/\.$//g' > -rwSr--r-- - $ ls -dl d/g | awk '{print $1}' + $ ls -dl d/g | awk '{print $1}' | sed 's/\.$//g' > -rw-r-Sr-- $ rm -Rf d |