Commit cf87af24 authored by unknown's avatar unknown

Updated after review


mysql-test/lib/mtr_process.pl:
  Fix spelling errors
mysql-test/lib/mtr_report.pl:
  Fix spelling errors
mysql-test/mysql-test-run.pl:
  Remove debug code
  Fix spelling errors
  Check if slave cluster installed ok if test needs it
parent 43b985f7
...@@ -297,7 +297,7 @@ sub spawn_parent_impl { ...@@ -297,7 +297,7 @@ sub spawn_parent_impl {
} }
} }
mtr_debug("waitpid() catched exit of unknown child $ret_pid, " . mtr_debug("waitpid() caught exit of unknown child $ret_pid, " .
"exit during mysqltest run"); "exit during mysqltest run");
} }
...@@ -505,9 +505,9 @@ sub mtr_kill_leftovers () { ...@@ -505,9 +505,9 @@ sub mtr_kill_leftovers () {
} }
# Check that all processes in list is killed # Check that all processes in list are killed
# The argument is a list of 'ports', 'pids', 'pidfiles' and 'socketfiles' # The argument is a list of 'ports', 'pids', 'pidfiles' and 'socketfiles'
# for which shutdown has been started. Make sure they all get killes # for which shutdown has been started. Make sure they all get killed
# in one way or the other. # in one way or the other.
# #
# FIXME On Cygwin, and maybe some other platforms, $srv->{'pid'} and # FIXME On Cygwin, and maybe some other platforms, $srv->{'pid'} and
...@@ -540,12 +540,12 @@ sub mtr_check_stop_servers ($) { ...@@ -540,12 +540,12 @@ sub mtr_check_stop_servers ($) {
$ret_pid= waitpid($srv->{'pid'},&WNOHANG); $ret_pid= waitpid($srv->{'pid'},&WNOHANG);
if ($ret_pid == $srv->{'pid'}) if ($ret_pid == $srv->{'pid'})
{ {
mtr_verbose("Catched exit of process $ret_pid"); mtr_verbose("Caught exit of process $ret_pid");
$srv->{'pid'}= 0; $srv->{'pid'}= 0;
} }
else else
{ {
# mtr_warning("catched exit of unknown child $ret_pid"); # mtr_warning("caught exit of unknown child $ret_pid");
} }
} }
} }
...@@ -667,7 +667,7 @@ sub mtr_wait_blocking($) { ...@@ -667,7 +667,7 @@ sub mtr_wait_blocking($) {
# Wait for all the started processes to exit # Wait for all the started processes to exit
# As mysqladmin is such a simple program, we trust it to terminate itself. # As mysqladmin is such a simple program, we trust it to terminate itself.
# I.e. we wait blocking, and wait wait for them all before we go on. # I.e. we wait blocking, and wait for them all before we go on.
foreach my $pid (keys %{$admin_pids}) foreach my $pid (keys %{$admin_pids})
{ {
my $ret_pid= waitpid($pid,0); my $ret_pid= waitpid($pid,0);
...@@ -789,7 +789,7 @@ sub mtr_record_dead_children () { ...@@ -789,7 +789,7 @@ sub mtr_record_dead_children () {
# -1 or 0 means there are no more procesess to wait for # -1 or 0 means there are no more procesess to wait for
while ( ($ret_pid= waitpid(-1,&WNOHANG)) != 0 and $ret_pid != -1) while ( ($ret_pid= waitpid(-1,&WNOHANG)) != 0 and $ret_pid != -1)
{ {
mtr_warning("waitpid() catched exit of child $ret_pid"); mtr_warning("waitpid() caught exit of child $ret_pid");
foreach my $idx (0..1) foreach my $idx (0..1)
{ {
if ( $::master->[$idx]->{'pid'} eq $ret_pid ) if ( $::master->[$idx]->{'pid'} eq $ret_pid )
......
...@@ -204,7 +204,7 @@ sub mtr_report_stats ($) { ...@@ -204,7 +204,7 @@ sub mtr_report_stats ($) {
"http://www.mysql.com/doc/en/MySQL_test_suite.html\n"; "http://www.mysql.com/doc/en/MySQL_test_suite.html\n";
} }
print print
"The servers was restarted $tot_restarts times\n"; "The servers were restarted $tot_restarts times\n";
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# If a debug run, there might be interesting information inside # If a debug run, there might be interesting information inside
......
...@@ -1602,18 +1602,7 @@ sub ndbcluster_start_install ($) { ...@@ -1602,18 +1602,7 @@ sub ndbcluster_start_install ($) {
s/CHOOSE_PORT_MGM/$cluster->{'port'}/; s/CHOOSE_PORT_MGM/$cluster->{'port'}/;
s/CHOOSE_DiskPageBufferMemory/$ndb_pbmem/; s/CHOOSE_DiskPageBufferMemory/$ndb_pbmem/;
# if ( /^\s*$/ ) print OUT "$_ \n";
# {
# print OUT "\n";
# }
# elsif (/;$/)
# {
# print OUT "$_\n";
# }
# else
# {
print OUT "$_ \n";
# }
} }
close OUT; close OUT;
close IN; close IN;
...@@ -2178,13 +2167,22 @@ sub run_testcase ($) { ...@@ -2178,13 +2167,22 @@ sub run_testcase ($) {
return; return;
} }
# FIXME if test need slave cluster, check if that is installed_ok # If test needs cluster, check that master installed ok
if ( $tinfo->{'ndb_test'} and $clusters->[0]->{'installed_ok'} eq "NO" ) if ( $tinfo->{'ndb_test'} and $clusters->[0]->{'installed_ok'} eq "NO" )
{ {
mtr_report_test_name($tinfo); mtr_report_test_name($tinfo);
mtr_report_test_failed($tinfo); mtr_report_test_failed($tinfo);
return; return;
} }
# If test needs slave cluster, check that it installed ok
if ( $tinfo->{'ndb_test'} and $tinfo->{'slave_num'} and
$clusters->[1]->{'installed_ok'} eq "NO" )
{
mtr_report_test_name($tinfo);
mtr_report_test_failed($tinfo);
return;
}
run_testcase_stop_servers($tinfo); run_testcase_stop_servers($tinfo);
......
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