Changeset 30 for trunk/test/testrun_1.sh

Timestamp:

Apr 27, 2006, 10:40:32 PM (18 years ago)

Author:

rainer

Message:

Release candidate 3 for version 2.2.0

File:

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

trunk/test/testrun_1.sh

@@ -82 +82 @@
     REPLACEMENT='FileCheckScheduleOne = 6 12 * * *'
     ex $RCFILE <<EOF
-:%s/${ORIGINAL}/${REPLACEMENT}/g
-:wq
+%s/${ORIGINAL}/${REPLACEMENT}/g
+wq
 EOF
 }
@@ -865 +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(?)";
+            [ -z "$verbose" ] || log_msg_fail "errors during check";
             return 1
         fi
@@ -889 +892 @@
 prep_testdata ()
 {
-    if [ -d "${BASE}" ]; then
-        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
 
@@ -947 +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...";