From: Marco van Wieringen <mvw@planets.elm.net>
Date: Sun, 6 Sep 2009 09:41:03 +0000 (+0200)
Subject: Added support for acl and xattr regression test on Solaris
X-Git-Tag: Release-7.0.0~2635^2~6
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=15e4ab345816ee3c92e342a50954fc77f57f8206;p=bacula%2Fbacula

Added support for acl and xattr regression test on Solaris

Signed-off-by: Kern Sibbald <kern@sibbald.com>
---

diff --git a/regress/tests/acl-xattr-test b/regress/tests/acl-xattr-test
index e1e827cab9..162238f382 100755
--- 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
@@ -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/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
+      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
+      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