more mkdir -p changes

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

diff --git a/regress/tests/acl-xattr-test b/regress/tests/acl-xattr-test
index e1e827cab99aebad36f18074d0c83efc67699d19..a5bda93b90d91bbf231a1171f669bde26065a8b0 100755 (executable)
--- a/regress/tests/acl-xattr-test
+++ b/regress/tests/acl-xattr-test
@@ -14,21 +14,34 @@ TestName="acl-xattr-test"
 JobName=backup
 . scripts/functions
 
-require_linux
-
-# Require getfacl to be installed
-getfacl Makefile 2>&1 >/dev/null
-if test  $? -ne 0; then
-  echo "$TestName skipped: getfacl not installed"
-  exit 0
-fi
-
-# Require attr to be installed
-attr -l Makefile 2>&1 >/dev/null
-if test $? -ne 0; then
-  echo "$TestName skipped: attr not installed"
-  exit 0
-fi
+#
+# See if the right software is installed.
+#
+case `uname -s` in
+   Linux)
+      # Require getfacl to be installed
+      getfacl Makefile 2>&1 >/dev/null
+      if test  $? -ne 0; then
+        echo "$TestName skipped: getfacl not installed"
+        exit 0
+      fi
+
+      # Require attr to be installed
+      attr -l Makefile 2>&1 >/dev/null
+      if test $? -ne 0; then
+        echo "$TestName skipped: attr not installed"
+        exit 0
+      fi
+      ;;
+   Darwin)
+      ;;
+   SunOS)
+      ;;
+   *)
+      echo "Unsupported OS"
+      exit 0
+      ;;
+esac
 
 scripts/cleanup
 scripts/copy-confs
@@ -47,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
 
@@ -68,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
 
@@ -82,9 +95,34 @@ case `uname -s` in
         xattr -p bacula.test $d/other > $cwd/tmp/attr.org
       )
       ;;
+   SunOS)
+      #
+      # See if we need to set ZFS or POSIX acls
+      #
+      df -F zfs $d > /dev/null 2>&1
+      if [ $? = 0 ]; then
+         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/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
+      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
+      )
+      ;;
 esac
 
-
 change_jobname BackupClient1 $JobName
 start_test
 
@@ -114,10 +152,26 @@ run_bacula
 check_for_zombie_jobs storage=File
 stop_bacula
 
-( cd $cwd/tmp/bacula-restores/$cwd/build
-  getfacl -R acl > $cwd/tmp/new
-  attr -g bacula.test $d/other > $cwd/tmp/attr.new
-)
+case `uname -s` in
+   Linux)
+      ( cd $cwd/tmp/bacula-restores/$cwd/build
+        getfacl -R acl > $cwd/tmp/new
+        attr -g bacula.test $d/other > $cwd/tmp/attr.new
+      )
+      ;;
+   Darwin)
+      ( cd $cwd/tmp/bacula-restores/$cwd/build
+        ls -lde -R acl > $cwd/tmp/new
+        xattr -p bacula.test $d/other > $cwd/tmp/attr.new
+      )
+      ;;
+   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
+      )
+      ;;
+esac
 
 diff -u $cwd/tmp/org $cwd/tmp/new
 if [ $? -ne 0 ]; then