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 | ec7e213b12d38b2cd0f6c3969b5f06d37ae6714f (patch) | |
| tree | 6be6822cba8f9a149dfa05d31f5fe9137d7a9e55 | |
| parent | f934270ae9ed23503dde31a8af2154af026c6d69 (diff) | |
| download | mariadb-git-ec7e213b12d38b2cd0f6c3969b5f06d37ae6714f.tar.gz | |
Bug#47612 mtr - improving the report for valgrind erorrs
- Improve the report produced when a valgrind error is detected
| -rw-r--r-- | mysql-test/include/check-warnings.test | 2 | ||||
| -rw-r--r-- | mysql-test/include/mtr_warnings.sql | 2 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 5 |
3 files changed, 6 insertions, 3 deletions
diff --git a/mysql-test/include/check-warnings.test b/mysql-test/include/check-warnings.test index 5295dd51a85..da6b7a7e92e 100644 --- a/mysql-test/include/check-warnings.test +++ b/mysql-test/include/check-warnings.test @@ -57,5 +57,5 @@ if (`select @result = 0`){ skip OK; } --enable_query_log -echo ^ Found warnings!!; +echo ^ Found warnings in $log_error!!; exit; diff --git a/mysql-test/include/mtr_warnings.sql b/mysql-test/include/mtr_warnings.sql index b99402c8031..c14d84ef0c8 100644 --- a/mysql-test/include/mtr_warnings.sql +++ b/mysql-test/include/mtr_warnings.sql @@ -207,7 +207,7 @@ BEGIN WHERE suspicious=1; IF @num_warnings > 0 THEN - SELECT file_name, line + SELECT line FROM error_log WHERE suspicious=1; --SELECT * FROM test_suppressions; -- Return 2 -> check failed 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/, |