diff options
Diffstat (limited to 'test/testrun_1b.sh')
| -rwxr-xr-x | test/testrun_1b.sh | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/test/testrun_1b.sh b/test/testrun_1b.sh index eda3ebf..c194821 100755 --- a/test/testrun_1b.sh +++ b/test/testrun_1b.sh @@ -67,8 +67,7 @@ testrun1b_internal () fi # # - ${TOP_SRCDIR}/configure ${BUILDOPTS} 2>/dev/null | \ - egrep 'use existing [./[:alnum:]]+ for gpg checksum' >/dev/null + ${TOP_SRCDIR}/configure ${BUILDOPTS} 2>/dev/null # # if test x$? = x0; then @@ -239,13 +238,15 @@ do_test_1b () { 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=$! + #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 + #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,39 +260,39 @@ do_test_1b_2 () { [ -z "$verbose" ] || log_msg_ok "check..."; 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 + #kill $PID return 1 fi - tmp=`egrep 'Classification text: Checking' test_log_prelude 2>/dev/null | wc -l` + 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 + #kill $PID return 1 fi - tmp=`egrep 'Service: port=5500' test_log_prelude 2>/dev/null | wc -l` + 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 } |