diff options
| author | Bjorn Munch <bjorn.bunch@oracle.com> | 2010-07-23 14:53:09 +0200 |
|---|---|---|
| committer | Bjorn Munch <bjorn.bunch@oracle.com> | 2010-07-23 14:53:09 +0200 |
| commit | 50cdef087d4a9787ae66ebc672b29e9c7ccd3c42 (patch) | |
| tree | 7485fe5038df469cccf2c1642c9ddf24d0b11b8b | |
| parent | f4dcccdfaf195a642c50e378088a09877171aef0 (diff) | |
| download | mariadb-git-50cdef087d4a9787ae66ebc672b29e9c7ccd3c42.tar.gz | |
Bug #55503 MTR fails to filter LEAK SUMMARY from valgrind report of restarted servers
Was not covered by "skip" pattern
Replace with a more generic pattern for SUMMARY
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index fce8ce5ec1c..93f9b671f5a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -3791,7 +3791,8 @@ sub extract_warning_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:/; + # Use a generic pattern for summaries + $skip_valgrind= 1 if $line =~ /^==\d+== [A-Z ]+ SUMMARY:/; $skip_valgrind= 0 unless $line =~ /^==\d+==/; next if $skip_valgrind; } |