Commit f4fc2207 authored by unknown's avatar unknown

Backport of patch for bug#24471


mysql-test/lib/mtr_report.pl:
  Don't output "skipped" comment if there is none (bug#24471)
mysql-test/mysql-test-run.pl:
  Removed "use diagnostics", reduces Perl speed significantly. Can be
  enabled with "perl -Mdiagnostics mysql-test-run.pl".
parent 4d2665f0
...@@ -89,10 +89,14 @@ sub mtr_report_test_skipped ($) { ...@@ -89,10 +89,14 @@ sub mtr_report_test_skipped ($) {
{ {
print "[ disabled ] $tinfo->{'comment'}\n"; print "[ disabled ] $tinfo->{'comment'}\n";
} }
else elsif ( $tinfo->{'comment'} )
{ {
print "[ skipped ] $tinfo->{'comment'}\n"; print "[ skipped ] $tinfo->{'comment'}\n";
} }
else
{
print "[ skipped ]\n";
}
} }
sub mtr_report_tests_not_skipped_though_disabled ($) { sub mtr_report_tests_not_skipped_though_disabled ($) {
......
...@@ -66,7 +66,6 @@ use IO::Socket::INET; ...@@ -66,7 +66,6 @@ use IO::Socket::INET;
use Data::Dumper; use Data::Dumper;
use strict; use strict;
use warnings; use warnings;
use diagnostics;
select(STDOUT); select(STDOUT);
$| = 1; # Automatically flush STDOUT $| = 1; # Automatically flush STDOUT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment