bk commit into 5.0 tree (kent:1.1922)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1922 05/08/25 16:25:54 kent@stripped +4 -0
  mtr_process.pl:
    Call mtr_timer_stop_all() at exit
  mtr_report.pl, mysql-test-run.pl:
    Added default/ps-protocol/embedded to abort and summary line
  mtr_timer.pl:
    Added function mtr_timer_stop_all()

  mysql-test/lib/mtr_process.pl
    1.16 05/08/25 16:23:15 kent@stripped +1 -0
    Call mtr_timer_stop_all() at exit

  mysql-test/lib/mtr_report.pl
    1.12 05/08/25 16:22:20 kent@stripped +2 -1
    Added default/ps-protocol/embedded to abort and summary line

  mysql-test/lib/mtr_timer.pl
    1.2 05/08/25 16:21:43 kent@stripped +24 -0
    Added function mtr_timer_stop_all()

  mysql-test/mysql-test-run.pl
    1.36 05/08/25 16:19:56 kent@stripped +10 -2
    Added default/ps-protocol/embedded to abort and summary line

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	dialup-d2i-62-65-89-38.home.se
# Root:	/Users/kent/mysql/bk/mysql-5.0-release

--- 1.15/mysql-test/lib/mtr_process.pl	2005-08-18 00:13:51 +02:00
+++ 1.16/mysql-test/lib/mtr_process.pl	2005-08-25 16:23:15 +02:00
@@ -841,6 +841,7 @@
 sub mtr_exit ($) {
   my $code= shift;
 #  cluck("Called mtr_exit()");
+  mtr_timer_stop_all($::glob_timers);
   local $SIG{HUP} = 'IGNORE';
   kill('HUP', -$$);
   sleep 2;

--- 1.11/mysql-test/lib/mtr_report.pl	2005-08-18 00:13:51 +02:00
+++ 1.12/mysql-test/lib/mtr_report.pl	2005-08-25 16:22:20 +02:00
@@ -223,7 +223,8 @@
 
   if ( $tot_failed != 0 )
   {
-    print "mysql-test-run: *** Failing the test(s):";
+    my $test_mode= join(" ", @::glob_test_mode) || "default";
+    print "mysql-test-run in $test_mode mode: *** Failing the test(s):";
 
     foreach my $tinfo (@$tests)
     {

--- 1.1/mysql-test/lib/mtr_timer.pl	2005-08-18 00:14:44 +02:00
+++ 1.2/mysql-test/lib/mtr_timer.pl	2005-08-25 16:21:43 +02:00
@@ -15,6 +15,7 @@
 sub mtr_init_timers ();
 sub mtr_timer_start($$$);
 sub mtr_timer_stop($$);
+sub mtr_timer_stop_all($);
 sub mtr_timer_waitpid($$$);
 
 ##############################################################################
@@ -109,6 +110,29 @@
   {
     mtr_debug("Asked to stop timer \"$name\" not started");
     return 0;
+  }
+}
+
+
+sub mtr_timer_stop_all ($) {
+  my $timers= shift;
+
+  foreach my $name ( keys %{$timers->{'timers'}} )
+  {
+    my $tpid= $timers->{'timers'}->{$name}->{'pid'};
+
+    # FIXME as Cygwin reuses pids fast, maybe check that is
+    # the expected process somehow?!
+    kill(9, $tpid);
+
+    # As the timers are so simple programs, we trust them to terminate,
+    # and use blocking wait for it. We wait just to avoid a zombie.
+    waitpid($tpid,0);
+
+    delete $timers->{'timers'}->{$name}; # Remove the timer information
+    delete $timers->{'pids'}->{$tpid};   # and PID reference
+
+    return 1;
   }
 }
 

--- 1.35/mysql-test/mysql-test-run.pl	2005-08-25 05:05:33 +02:00
+++ 1.36/mysql-test/mysql-test-run.pl	2005-08-25 16:19:56 +02:00
@@ -142,6 +142,7 @@
 our $glob_use_running_server=     0;
 our $glob_use_running_ndbcluster= 0;
 our $glob_use_embedded_server=    0;
+our @glob_test_mode;
 
 our $glob_basedir;
 
@@ -606,6 +607,7 @@
   if ( $opt_embedded_server )
   {
     $glob_use_embedded_server= 1;
+    push(@glob_test_mode, "embedded");
     $opt_skip_rpl= 1;              # We never run replication with embedded
 
     if ( $opt_extern )
@@ -614,6 +616,11 @@
     }
   }
 
+  if ( $opt_ps_protocol )
+  {
+    push(@glob_test_mode, "ps-protocol");
+  }
+
   # FIXME don't understand what this is
 #  if ( $opt_local_master )
 #  {
@@ -1562,8 +1569,9 @@
   print "\n";
   if ( ! $opt_force )
   {
-    print "Aborting: $tinfo->{'name'} failed. To continue, re-run with '--force'.";
-    print "\n";
+    my $test_mode= join(" ", @::glob_test_mode) || "default";
+    print "Aborting: $tinfo->{'name'} failed in $test_mode mode. ";
+    print "To continue, re-run with '--force'.\n";
     if ( ! $opt_gdb and ! $glob_use_running_server and
          ! $opt_ddd and ! $glob_use_embedded_server )
     {