diff options
| author | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-19 15:33:34 +0200 |
|---|---|---|
| committer | Bjorn Munch <Bjorn.Munch@sun.com> | 2009-10-19 15:33:34 +0200 |
| commit | 2f36bc160aa8aa8788d28e358dfcabc648ba2ffd (patch) | |
| tree | 97c4de062930cd23ec4d023e042e3a08b412d70d | |
| parent | 72c96cbd0e4d860df5f395a292003c7571e0122e (diff) | |
| parent | c6533f9eb3945a36608fd90a6f7100028da54c2c (diff) | |
| download | mariadb-git-2f36bc160aa8aa8788d28e358dfcabc648ba2ffd.tar.gz | |
merge 48130 and 48133
| -rw-r--r-- | mysql-test/lib/mtr_report.pm | 1 | ||||
| -rwxr-xr-x | mysql-test/mysql-test-run.pl | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mysql-test/lib/mtr_report.pm b/mysql-test/lib/mtr_report.pm index f2131b9bd76..937e19111fb 100644 --- a/mysql-test/lib/mtr_report.pm +++ b/mysql-test/lib/mtr_report.pm @@ -146,6 +146,7 @@ sub mtr_report_test ($) { } } $fail = "exp-fail"; + $tinfo->{exp_fail}= 1; last; } } diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index bf60a4b33e0..4d93b0dd71b 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -520,7 +520,8 @@ sub run_test_server ($$$) { } } $num_saved_datadir++; - $num_failed_test++ unless $result->{retries}; + $num_failed_test++ unless ($result->{retries} || + $result->{exp_fail}); if ( !$opt_force ) { # Test has failed, force is off @@ -4708,7 +4709,8 @@ sub start_servers($) { my $logfile= $mysqld->value('#log-error'); if ( defined $logfile and -f $logfile ) { - $tinfo->{logfile}= mtr_fromfile($logfile); + my @srv_lines= extract_server_log($logfile, $tinfo->{name}); + $tinfo->{logfile}= "Server log is:\n" . join ("", @srv_lines); } else { |