diff options
Diffstat (limited to 'test/testrun_1e.sh')
| -rwxr-xr-x | test/testrun_1e.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/test/testrun_1e.sh b/test/testrun_1e.sh index 3cdd4cd..c2d874b 100755 --- a/test/testrun_1e.sh +++ b/test/testrun_1e.sh @@ -24,6 +24,8 @@ export BUILDOPTS MAXTEST=5; export MAXTEST +test_log_prelude="/var/log/prelude/prelude-text.log"; export test_log_prelude + PORTPOLICY_5=" [ReadOnly] file=${BASE} @@ -41,7 +43,7 @@ chk_portdata_5 () { elif [ -z "$doall" ]; then 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"; [ -z "$quiet" ] && log_fail 5 ${MAXTEST}; @@ -186,6 +188,8 @@ prep_portpolicy () 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 if test x$? = x0; then @@ -321,9 +325,9 @@ testrun_internal_1e () # # - [ -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=$! # # five_sec_sleep |