Changeset 562 for trunk/test/testrun_1e.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_1e.sh (modified) (4 diffs)

trunk/test/testrun_1e.sh

@@ -25 +25 @@
 MAXTEST=5; export MAXTEST
 
+test_log_prelude="/var/log/prelude/prelude-text.log"; export test_log_prelude
+
 PORTPOLICY_5="
 [ReadOnly]
@@ -42 +44 @@
         log_skip 5 $MAXTEST 'logging to prelude (or use --really-all)'
     else
-        tmp=`egrep 'Service: port=5500 .unknown. protocol=tcp' test_log_prelude 2>/dev/null | wc -l`
+        tmp=`egrep 'Service: port=5500 .unknown. protocol=tcp' ${test_log_prelude} 2>/dev/null | wc -l`
         if [ $tmp -lt 1 ]; then
             [ -z "$verbose" ] || log_msg_fail "port 5500";
@@ -187 +189 @@
 run_check_prelude()
 {
+    echo -n >"${test_log_prelude}"
+
     ./samhain -t check -p none -l info --set-prelude-severity=info --prelude --server-addr 127.0.0.1:5500 >/dev/null
  
@@ -322 +326 @@
                   #
                   #
-                  [ -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 &
-                  PRELUDEPID=$!
+                  #[ -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 &
+                  #PRELUDEPID=$!
                   #
                   #