Changeset 562 for trunk/test/testrun_1b.sh

Timestamp:

Jun 29, 2021, 10:23:44 PM (3 years ago)

Author:

katerina

Message:

Fix for ticket #450 (compiler warnings) and fixes for tests.

File:

• trunk/test/testrun_1b.sh (modified) (2 diffs)

trunk/test/testrun_1b.sh

@@ -239 +239 @@
 do_test_1b_2 () {
 
-    rm -f $PW_DIR/test_log_prelude
-
-    [ -z "$verbose" ] || { echo " starting prelude-manager.."; echo " ($PM --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &)"; }
-    "$PM" --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &
-    PID=$!
-
-    five_sec_sleep
+    #rm -f $PW_DIR/test_log_prelude
+    test_log_prelude="/var/log/prelude/prelude-text.log"
+    echo -n >"${test_log_prelude}"
+    
+    #[ -z "$verbose" ] || { echo " starting prelude-manager.."; echo " ($PM --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &)"; }
+    #"$PM" --textmod -l $PW_DIR/test_log_prelude --listen 127.0.0.1:5500 >/dev/null 2>&1 &
+    #PID=$!
+
+    #five_sec_sleep
 
     ./samhain -t check -p none -l info --set-prelude-severity=info --prelude --server-addr 127.0.0.1:5500 >/dev/null
@@ -259 +261 @@
     else
         [ -z "$quiet" ]   && log_msg_fail  "check...";
-        kill $PID
+        #kill $PID
         return 1
     fi
     #
-    tmp=`egrep 'File original:.*name=etc.*path=/etc' test_log_prelude 2>/dev/null | wc -l`
+    tmp=`egrep 'File original:.*name=etc.*path=/etc' ${test_log_prelude} 2>/dev/null | wc -l`
     if [ $tmp -lt 1 ]; then
         [ -z "$verbose" ] || log_msg_fail "/etc";
-        kill $PID
-        return 1
-    fi
-    tmp=`egrep 'Classification text: Checking' test_log_prelude 2>/dev/null | wc -l`
+        #kill $PID
+        return 1
+    fi
+    tmp=`egrep 'Classification text: Checking' ${test_log_prelude} 2>/dev/null | wc -l`
     if [ $tmp -lt 1 ]; then
         [ -z "$verbose" ] || log_msg_fail "checking";
-        kill $PID
+        #kill $PID
         return 1
     fi
     #
     if test "x$2" = "xmodrc"; then
-        tmp=`egrep 'Classification text: Service opened' test_log_prelude 2>/dev/null | wc -l`
+        tmp=`egrep 'Classification text: Service opened' ${test_log_prelude} 2>/dev/null | wc -l`
         if [ $tmp -lt 1 ]; then
             [ -z "$verbose" ] || log_msg_fail "service";
-            kill $PID
-            return 1
-        fi
-        tmp=`egrep 'Service: port=5500' test_log_prelude 2>/dev/null | wc -l`
+            #kill $PID
+            return 1
+        fi
+        tmp=`egrep 'Service: port=5500' ${test_log_prelude} 2>/dev/null | wc -l`
         if [ $tmp -lt 1 ]; then
             [ -z "$verbose" ] || log_msg_fail "port 5500";
-            kill $PID
+            #kill $PID
             return 1
         fi
     fi
     #
-    kill $PID
+    #kill $PID
     return 0
 }