diff options
| author | Magnus Blåudd <magnus.blaudd@sun.com> | 2009-09-24 16:09:11 +0200 |
|---|---|---|
| committer | Magnus Blåudd <magnus.blaudd@sun.com> | 2009-09-24 16:09:11 +0200 |
| commit | 621e98a31b982ca32f288c2b7ff6388a33233bfd (patch) | |
| tree | 6be6822cba8f9a149dfa05d31f5fe9137d7a9e55 /mysql-test/mysql-test-run.pl | |
| parent | 0ed8eea6b6777794e67596bb31b8d3e7e05e48b2 (diff) | |
| download | mariadb-git-621e98a31b982ca32f288c2b7ff6388a33233bfd.tar.gz | |
Bug#47612 mtr - improving the report for valgrind erorrs
- Improve the report produced when a valgrind error is detected
Diffstat (limited to 'mysql-test/mysql-test-run.pl')
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 2a6a069d81c..4260af75fd3 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1307,6 +1307,9 @@ sub command_line_setup { push(@valgrind_args, @default_valgrind_args) unless @valgrind_args; + # Make valgrind run in quiet mode so it only print errors + push(@valgrind_args, "--quiet" ); + mtr_report("Running valgrind with options \"", join(" ", @valgrind_args), "\""); } @@ -3588,7 +3591,7 @@ sub extract_warning_lines ($) { # qr/^Error:|\[ERROR\]/, qr/^Warning:|mysqld: Warning/, qr/^Error:/, - qr/^==.* at 0x/, + qr/^==\d*==/, # valgrind errors qr/InnoDB: Warning|InnoDB: Error/, qr/^safe_mutex:|allocated at line/, qr/missing DBUG_RETURN/, |