X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=regress%2Ftests%2Facl-xattr-test;h=a5bda93b90d91bbf231a1171f669bde26065a8b0;hb=a47d15cbcf6e8d54a7c9604b4e4ea897f7ee0056;hp=162238f382c13479a31634eb5dfaa6ff5dd7e76c;hpb=15e4ab345816ee3c92e342a50954fc77f57f8206;p=bacula%2Fbacula

diff --git a/regress/tests/acl-xattr-test b/regress/tests/acl-xattr-test
index 162238f382..a5bda93b90 100755
--- a/regress/tests/acl-xattr-test
+++ b/regress/tests/acl-xattr-test
@@ -60,18 +60,18 @@ d=${cwd}/build/acl
 
 uid=`id -u`
 rm -rf $d
-mkdir $d
-mkdir $d/testdir
+mkdir -p $d
+mkdir -p $d/acl-dir
 cp ${cwd}/bin/bconsole $d
 
 case `uname -s` in
    Linux)
-      setfacl -m d:user:$uid:r-x $d/testdir
-      setfacl -m d:user:root:-wx $d/testdir
-      setfacl -m user:nobody:--- $d/testdir
+      setfacl -m d:user:$uid:r-x $d/acl-dir
+      setfacl -m d:user:root:-wx $d/acl-dir
+      setfacl -m user:nobody:--- $d/acl-dir
       setfacl -m user:nobody:--- $d/bconsole
       setfacl -m group:nogroup:--x $d/bconsole
-      cp ${cwd}/bin/bconsole $d/testdir
+      cp ${cwd}/bin/bconsole $d/acl-dir
       cp ${cwd}/bin/bconsole $d/other
       attr -s bacula.test -V rulez $d/other 2>/dev/null 1>/dev/null
 
@@ -81,12 +81,12 @@ case `uname -s` in
       )
       ;;
    Darwin)
-      chmod +a "user:$uid allow read execute" $d/testdir
-      chmod +a "user:root allow write execute" $d/testdir
-      chmod +a "user:nobody deny read write execute" $d/testdir
+      chmod +a "user:$uid allow read execute" $d/acl-dir
+      chmod +a "user:root allow write execute" $d/acl-dir
+      chmod +a "user:nobody deny read write execute" $d/acl-dir
       chmod +a "user:nobody deny read write execute" $d/bconsole
       chmod +a "group:nogroup allow execute" $d/bconsole
-      cp ${cwd}/bin/bconsole $d/testdir
+      cp ${cwd}/bin/bconsole $d/acl-dir
       cp ${cwd}/bin/bconsole $d/other
       xattr -w  bacula.test "rulez" $d/other 2>/dev/null 1>/dev/null
 
@@ -101,15 +101,15 @@ case `uname -s` in
       #
       df -F zfs $d > /dev/null 2>&1
       if [ $? = 0 ]; then
-         chmod A+user:$uid:rx:allow $d/testdir
-         chmod A+user:root:wx:allow $d/testdir
-         chmod A+user:nobody:rwx:deny $d/testdir
+         chmod A+user:$uid:rx:allow $d/acl-dir
+         chmod A+user:root:wx:allow $d/acl-dir
+         chmod A+user:nobody:rwx:deny $d/acl-dir
          chmod A+user:nobody:rwx:deny $d/bconsole
          chmod A+group:nogroup:x:allow $d/bconsole
       else
-         chmod A+user:$uid:r-x $d/testdir
-         chmod A+user:root:-wx $d/testdir
-         chmod A+user:nobody:--- $d/testdir
+         chmod A+user:$uid:r-x $d/acl-dir
+         chmod A+user:root:-wx $d/acl-dir
+         chmod A+user:nobody:--- $d/acl-dir
          chmod A+user:nobody:--- $d/bconsole
          chmod A+group:nogroup:--x $d/bconsole
       fi