diff --git a/tests/integration/logging.tcl b/tests/integration/logging.tcl index 3314f0f1d..fd9034644 100644 --- a/tests/integration/logging.tcl +++ b/tests/integration/logging.tcl @@ -1,7 +1,7 @@ -set server_path [tmpdir server.log] set system_name [string tolower [exec uname -s]] if {$system_name eq {linux} || $system_name eq {darwin}} { + set server_path [tmpdir server.log] start_server [list overrides [list dir $server_path]] { test "Server is able to generate a stack trace on selected systems" { r config set watchdog-period 200 @@ -21,15 +21,19 @@ if {$system_name eq {linux} || $system_name eq {darwin}} { } } } -} -set server_path [tmpdir server1.log] -start_server [list overrides [list dir $server_path]] { - test "Crash report generated on SIGABRT" { - set pid [s process_id] - exec kill -SIGABRT $pid - set pattern "*STACK TRACE*" - set result [exec tail -1000 < [srv 0 stdout]] - assert {[string match $pattern $result]} + # Valgrind will complain that the process terminated by a signal, skip it. + if {!$::valgrind} { + set server_path [tmpdir server1.log] + start_server [list overrides [list dir $server_path]] { + test "Crash report generated on SIGABRT" { + set pid [s process_id] + exec kill -SIGABRT $pid + set pattern "*STACK TRACE*" + set result [exec tail -1000 < [srv 0 stdout]] + assert {[string match $pattern $result]} + } + } } + }