Looks Good
-- didrik
On Mon, 16 Nov 2009 11:19:58 +0100, Bjorn Munch <Bjorn.Munch@stripped>
wrote:
> #At file:///home/bm136801/my/valgsumm-51/ based on
> revid:bjorn.munch@stripped
>
> 2854 Bjorn Munch 2009-11-16
> 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
>
> modified:
> mysql-test/mysql-test-run.pl
> === modified file 'mysql-test/mysql-test-run.pl'
> --- a/mysql-test/mysql-test-run.pl 2009-11-12 10:04:01 +0000
> +++ b/mysql-test/mysql-test-run.pl 2009-11-16 10:18:16 +0000
> @@ -3700,9 +3700,17 @@ sub extract_warning_lines ($$) {
> qr/Attempting backtrace/,
> qr/Assertion .* failed/,
> );
> + my $skip_valgrind= 0;
> 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 )
> {
> if ( $line =~ /$pat/ )
>
