diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2022-12-23 11:45:14 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2022-12-23 11:54:15 +0300 |
| commit | 9bc0275c158740efa05174676cd1e2aa79ab41aa (patch) | |
| tree | 7191beaaeb6218c6ab1000ac7465e1c65645d200 | |
| parent | 0a67daad060459c27a1fb776e0a654a76c457804 (diff) | |
| download | mariadb-git-bb-10.6-midenok.tar.gz | |
MDEV-30186 Use of uninitialized value $test_name in substitutionbb-10.6-midenok
Revert "Format properly mtr report for the test case that is not completed"
This reverts commit 0c62b6d5652a66fa654e91dd27e0a16433920e5c.
Revert "MDEV-25857: MTR should report at least last test that was executed in case of shutdown and not-completed"
This reverts commit 29e8c154172bd6b9dccd9757fddace93be6ad194.
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | mysql-test/mariadb-test-run.pl | 18 |
2 files changed, 2 insertions, 17 deletions
diff --git a/.gitignore b/.gitignore index 5376c582985..d1a780e9e8a 100644 --- a/.gitignore +++ b/.gitignore @@ -514,7 +514,6 @@ _UpgradeReport_Files/ Backup*/ UpgradeLog*.XML UpgradeLog*.htm -*.stackdump # SQL Server files *.mdf diff --git a/mysql-test/mariadb-test-run.pl b/mysql-test/mariadb-test-run.pl index 27d62400fd5..b50c5f3f2e3 100755 --- a/mysql-test/mariadb-test-run.pl +++ b/mysql-test/mariadb-test-run.pl @@ -515,13 +515,6 @@ sub main { } if ( not @$completed ) { - my $test_name= mtr_grab_file($path_testlog); - $test_name =~ s/^CURRENT_TEST:\s//; - chomp($test_name); - my $tinfo = My::Test->new(name => $test_name); - $tinfo->{result}= 'MTR_RES_FAILED'; - $tinfo->{comment}=' '; - mtr_report_test($tinfo); mtr_error("Test suite aborted"); } @@ -5122,15 +5115,8 @@ sub mysqld_start ($$) { $opt_start_timeout, $mysqld->{'proc'}, $warn_seconds); if (!$rc) { - # Report failure about the last test case before exit - my $test_name= mtr_grab_file($path_current_testlog); - $test_name =~ s/^CURRENT_TEST:\s//; - my $tinfo = My::Test->new(name => $test_name); - $tinfo->{result}= 'MTR_RES_FAILED'; - $tinfo->{failures}= 1; - $tinfo->{logfile}=get_log_from_proc($mysqld->{'proc'}, $tinfo->{name}); - report_option('verbose', 1); - mtr_report_test($tinfo); + my $mname= $mysqld->name(); + mtr_error("Failed to start mysqld $mname with command $exe"); } return $rc; } |