Merge branch 'master' into basejobv3

[bacula/bacula] / regress / tests / acl-xattr-test

diff --git a/regress/tests/acl-xattr-test b/regress/tests/acl-xattr-test
index 162238f382c13479a31634eb5dfaa6ff5dd7e76c..3a28ab2a2ac15a15e0df8106afe740f66432ba6f 100755 (executable)
--- 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,24 +101,25 @@ 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:nobody:rwx:deny $d/bconsole
-         chmod A+group:nogroup:x:allow $d/bconsole
+         /bin/chmod A+user:$uid:rx:allow $d/acl-dir
+         /bin/chmod A+user:root:wx:allow $d/acl-dir
+         /bin/chmod A+user:nobody:rwx:deny $d/acl-dir
+         /bin/chmod A+user:nobody:rwx:deny $d/bconsole
+         /bin/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:nobody:--- $d/bconsole
-         chmod A+group:nogroup:--x $d/bconsole
+         /bin/chmod A+user:$uid:r-x $d/acl-dir
+         /bin/chmod A+user:root:-wx $d/acl-dir
+         /bin/chmod A+user:nobody:--- $d/acl-dir
+         /bin/chmod A+user:nobody:--- $d/bconsole
+         /bin/chmod A+group:nogroup:--x $d/bconsole
       fi
-      runat $d/other 'cat > bacula.test' << EOF
+      cp ${cwd}/bin/bconsole $d/other
+      /bin/runat $d/other 'cat > bacula.test' << EOF
 rulez
 EOF
       ( cd $cwd/build
-        ls -ldv -R acl > $cwd/tmp/org
-        runat $d/other 'cat bacula.test' > $cwd/tmp/attr.org
+        /bin/ls -ldv -R acl > $cwd/tmp/org
+        /bin/runat $d/other 'cat bacula.test' > $cwd/tmp/attr.org
       )
       ;;
 esac
@@ -130,7 +131,7 @@ cat <<END_OF_DATA >${cwd}/tmp/bconcmds
 @$out /dev/null
 messages
 @$out ${cwd}/tmp/log1.out
-label volume=TestVolume001 storage=File pool=Default
+label volume=TestVolume001 storage=File pool=File
 setdebug level=400 trace=1 client
 setdebug level=300 trace=1 director
 setdebug level=300 trace=1 storage
@@ -167,8 +168,8 @@ case `uname -s` in
       ;;
    SunOS)
       ( cd $cwd/tmp/bacula-restores/$cwd/build
-        ls -ldv -R acl > $cwd/tmp/new
-        runat $d/other 'cat bacula.test' > $cwd/tmp/attr.new
+        /bin/ls -ldv -R acl > $cwd/tmp/new
+        /bin/runat $d/other 'cat bacula.test' > $cwd/tmp/attr.new
       )
       ;;
 esac