Changeset 207 for trunk/test/testrun_1.sh

Timestamp:

Jan 16, 2009, 11:52:26 PM (16 years ago)

Author:

katerina

Message:

Fix for ticket #134 (size may get truncated to INT_MAX)

File:

• trunk/test/testrun_1.sh (modified) (4 diffs)

trunk/test/testrun_1.sh

@@ -190 +190 @@
 #
 TESTPOLICY_11="
+[Misc]
+UseAclCheck=yes
+UseSelinuxCheck=yes
 [ReadOnly]
 dir=99${BASE}
@@ -231 +234 @@
 
 TESTPOLICY_10="
+[Misc]
+UseAclCheck=yes
+UseSelinuxCheck=yes
 [ReadOnly]
 dir=99${BASE}
@@ -253 +259 @@
     # CDIRS="a b c a/a a/b a/c a/a/a a/a/b a/a/c a/a/a/a a/a/a/b a/a/a/c";
     tmp=`grep CRIT $LOGFILE | wc -l`
-    if [ $tmp -ne 3 ]; then
+    if [ $tmp -ne 5 ]; then
         [ -z "$verbose" ] || log_msg_fail "policy count";
         return 1
@@ -1241 +1247 @@
           let "tcount = tcount + 1" >/dev/null
           #
-          if [ -z "$doall" -a $tcount -eq 10 ]; then
-              log_skip 10 $MAXTEST 'ACL/SELinux test (or use --really-all)'
-              let "tcount = tcount + 1" >/dev/null
-          fi
-          #
-          if [ -z "$doall" -a $tcount -eq 11 ]; then
-              log_skip 11 $MAXTEST 'ACL/SELinux test (or use --really-all)'
-              let "tcount = tcount + 1" >/dev/null
+          if [ $tcount -eq 10 ]; then
+              if [ -z "$doall" ]; then
+                  log_skip 10 $MAXTEST 'ACL/SELinux test (or use --really-all)'
+                  log_skip 11 $MAXTEST 'ACL/SELinux test (or use --really-all)'
+                  let "tcount = tcount + 2" >/dev/null
+              else
+                  # 'id -u' is posix
+                  #
+                  if test -f /usr/xpg4/bin/id
+                  then
+                      my_uid=`/usr/xpg4/bin/id -u`
+                  else
+                      my_uid=`id -u`
+                  fi
+                  #
+                  if [ ${my_uid} -ne 0 ]; then
+                      log_skip 10 $MAXTEST 'ACL/SELinux test (you are not root)'
+                      log_skip 11 $MAXTEST 'ACL/SELinux test (you are not root)'
+                      let "tcount = tcount + 2" >/dev/null
+                  else
+
+                      SETFATTR=`find_path setfattr`
+                      if [ -z "$SETFATTR" ]; then
+                          log_skip 10 $MAXTEST 'ACL/SELinux test (setfattr not in path)'
+                          log_skip 11 $MAXTEST 'ACL/SELinux test (setfattr not in path)'
+                          let "tcount = tcount + 2" >/dev/null
+                      fi
+                  fi
+              fi
           fi
           #