Changes in trunk/test/testrun_1.sh [19:30]

File:

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

trunk/test/testrun_1.sh

@@ -1 +1 @@
 #! /bin/sh
+
+#
+# Copyright Rainer Wichmann (2006)
+#
+# License Information:
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
 
 RCFILE="$PW_DIR/testrc_1.dyn";  export RCFILE
@@ -22 +41 @@
 testrun1_setup=0
 
-MAXTEST=10; export MAXTEST
+MAXTEST=11; export MAXTEST
 
 test_dirs () {
@@ -46 +65 @@
         fi
     done
+}
+
+# 
+# combine file check schedule with one-shot mode 
+# 
+TESTPOLICY_11="
+[ReadOnly]
+dir=99${BASE}
+"
+
+mod_testdata_11 () {
+    sleep 1
+    echo "foobar" >"${BASE}/c/x"; # bad
+    chmod 0555  "${BASE}/a/y";    # bad
+    ORIGINAL='SetFilecheckTime=60'
+    REPLACEMENT='FileCheckScheduleOne = 6 12 * * *'
+    ex $RCFILE <<EOF
+%s/${ORIGINAL}/${REPLACEMENT}/g
+wq
+EOF
+}
+
+chk_testdata_11 () {
+    # 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 2 ]; then
+        [ -z "$verbose" ] || log_msg_fail "policy count";
+        return 1
+    fi
+    egrep "CRIT.*POLICY \[ReadOnly\] C-------TS.*${BASE}/c/x" $LOGFILE >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        [ -z "$verbose" ] || log_msg_fail "${BASE}/c/x";
+        return 1
+    fi
+    egrep "CRIT.*POLICY \[ReadOnly\] -----M--T-.*${BASE}/a/y" $LOGFILE >/dev/null 2>&1
+    if [ $? -ne 0 ]; then
+        [ -z "$verbose" ] || log_msg_fail "${BASE}/a/y";
+        return 1
+    fi
+    CDIRS="a a/a a/b a/c c b a/a/a a/a/b a/a/c a/a/a/a a/a/a/b a/a/a/c";
+    NDIRS="";
+    test_dirs;
+    return $?
 }
 
@@ -749 +811 @@
 run_init ()
 {
-    ./samhain -t init -p none
+    rm -f test_log_valgrind
+
+    ${VALGRIND} ./samhain -t init -p none 2>>test_log_valgrind
 
     if test x$? = x0; then
@@ -761 +825 @@
 run_check ()
 {
-    ./samhain -t check -p none -l debug
+    ${VALGRIND} ./samhain -t check -p none -l debug 2>>test_log_valgrind
 
     if test x$? = x0; then
@@ -778 +842 @@
 run_update ()
 {
-    ./samhain -t update -p none -l debug
+    ${VALGRIND} ./samhain -t update -p none -l debug 2>>test_log_valgrind
 
     if test x$? = x0; then
@@ -792 +856 @@
     rm -rf $LOGFILE
 
-    ./samhain -t check -p none -l debug
+    ${VALGRIND} ./samhain -t check -p none -l debug 2>>test_log_valgrind
 
     if test x$? = x0; then
@@ -801 +865 @@
             return 1
         fi
-        tmp=`./samhain -j -L $LOGFILE | grep ERR | wc -l`
+        #
+        # wtmp may not be readable
+        #
+        tmp=`./samhain -j -L $LOGFILE | grep ERR | grep -v wtmp | wc -l`
         if [ $tmp -ne 0 ]; then
-            [ -z "$verbose" ] || log_msg_fail "update not successful(?)";
-            return 1
-        fi
+            [ -z "$verbose" ] || log_msg_fail "errors during check";
+            return 1
+        fi
+        #
+        [ -z "$VALGRIND" ] || {
+            tmp=`cat test_log_valgrind 2>/dev/null | wc -l`;
+            if [ $tmp -ne 0 ]; then
+                [ -z "$verbose" ] || log_msg_fail "valgrind reports errors";
+                cat test_log_valgrind
+                return 1;
+            fi;
+        }
         #
         [ -z "$verbose" ] || log_msg_ok    "check(2)...";
@@ -816 +892 @@
 prep_testdata ()
 {
-    chmod -R 0700 "${BASE}" || {
-        [ -z "$quiet" ] &&   log_msg_fail "chmod -R 0700 ${BASE}"; 
-        return 1;
-    }
+    if test -d "$BASE"; then
+        if [ -d "${BASE}" ]; then
+            chmod -R 0700 "${BASE}" || {
+                [ -z "$quiet" ] &&   log_msg_fail "chmod -R 0700 ${BASE}"; 
+                return 1;
+            }
+        fi
+    fi
 
     rm -rf "${BASE}" || {
@@ -872 +952 @@
         if test x$? = x0; then
                 [ -z "$verbose" ] ||     log_msg_ok "configure..."; 
-                $MAKE  > /dev/null
+                $MAKE  >/dev/null 2>>test_log
                 if test x$? = x0; then
                     [ -z "$verbose" ] || log_msg_ok "make...";