Commit 6edaebbf authored by Bjorn Munch's avatar Bjorn Munch

Bug #48795 Valgrind summary from tests where server has been restarted cause test failure

Seen in a few tests after 43418
Add code in extract_warning_lines() to skip this part
parent 59940cdc
...@@ -3700,9 +3700,17 @@ sub extract_warning_lines ($$) { ...@@ -3700,9 +3700,17 @@ sub extract_warning_lines ($$) {
qr/Attempting backtrace/, qr/Attempting backtrace/,
qr/Assertion .* failed/, qr/Assertion .* failed/,
); );
my $skip_valgrind= 0;
foreach my $line ( @lines ) foreach my $line ( @lines )
{ {
if ($opt_valgrind_mysqld) {
# Skip valgrind summary from tests where server has been restarted
# Should this contain memory leaks, the final report will find it
$skip_valgrind= 1 if $line =~ /^==\d+== ERROR SUMMARY:/;
$skip_valgrind= 0 unless $line =~ /^==\d+==/;
next if $skip_valgrind;
}
foreach my $pat ( @patterns ) foreach my $pat ( @patterns )
{ {
if ( $line =~ /$pat/ ) if ( $line =~ /$pat/ )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment