bk commit into 4.1 tree (joerg:1.2435)

[Joerg Bruehe]

Below is the list of changes that have just been committed into a local
4.1 repository of joerg. When joerg 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.2435 05/09/14 13:55:53 joerg@stripped +2 -0
  Improve error / process handling in the Perl script to run the test suite (patch supplied by Kent).

  mysql-test/lib/mtr_report.pl
    1.14 05/09/14 13:55:48 joerg@stripped +6 -0
    New function to handle errors in child processes separate from the parent process (patch supplied by Kent).
    Expected to avoid HUP signals.

  mysql-test/lib/mtr_process.pl
    1.19 05/09/14 13:55:48 joerg@stripped +5 -5
    Handle errors in child processes separate from the parent process (patch supplied by Kent).

# 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:	joerg
# Host:	trift2.
# Root:	/M41/push-4.1

--- 1.18/mysql-test/lib/mtr_process.pl	2005-09-01 14:32:05 +02:00
+++ 1.19/mysql-test/lib/mtr_process.pl	2005-09-14 13:55:48 +02:00
@@ -166,7 +166,7 @@
       {
         if ( ! open(STDOUT,$log_file_open_mode,$output) )
         {
-          mtr_error("can't redirect STDOUT to \"$output\": $!");
+          mtr_child_error("can't redirect STDOUT to \"$output\": $!");
         }
       }
 
@@ -176,14 +176,14 @@
         {
           if ( ! open(STDERR,">&STDOUT") )
           {
-            mtr_error("can't dup STDOUT: $!");
+            mtr_child_error("can't dup STDOUT: $!");
           }
         }
         else
         {
           if ( ! open(STDERR,$log_file_open_mode,$error) )
           {
-            mtr_error("can't redirect STDERR to \"$error\": $!");
+            mtr_child_error("can't redirect STDERR to \"$error\": $!");
           }
         }
       }
@@ -192,13 +192,13 @@
       {
         if ( ! open(STDIN,"<",$input) )
         {
-          mtr_error("can't redirect STDIN to \"$input\": $!");
+          mtr_child_error("can't redirect STDIN to \"$input\": $!");
         }
       }
 
       if ( ! exec($path,@$arg_list_t) )
       {
-        mtr_error("failed to execute \"$path\": $!");
+        mtr_child_error("failed to execute \"$path\": $!");
       }
     }
   }

--- 1.13/mysql-test/lib/mtr_report.pl	2005-09-14 13:12:26 +02:00
+++ 1.14/mysql-test/lib/mtr_report.pl	2005-09-14 13:55:48 +02:00
@@ -19,6 +19,7 @@
 sub mtr_report (@);
 sub mtr_warning (@);
 sub mtr_error (@);
+sub mtr_child_error (@);
 sub mtr_debug (@);
 
 
@@ -284,6 +285,11 @@
 sub mtr_error (@) {
   print STDERR "mysql-test-run: *** ERROR: ",join(" ", @_),"\n";
   mtr_exit(1);
+}
+
+sub mtr_child_error (@) {
+  print STDERR "mysql-test-run: *** ERROR(child): ",join(" ", @_),"\n";
+  exit(1);
 }
 
 sub mtr_debug (@) {