bk commit into 5.0 tree (msvensson:1.2117)

[msvensson]

Below is the list of changes that have just been committed into a local
5.0 repository of msvensson. When msvensson 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.2117 06/05/03 20:04:57 msvensson@neptunus.(none) +1 -0
  Check if "../libtool" is available and use it only when it is.

  mysql-test/mysql-test-run.pl
    1.94 06/05/03 20:04:54 msvensson@neptunus.(none) +19 -12
    Check if "../libtool" is available and use it only when it is.

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0-maint

--- 1.93/mysql-test/mysql-test-run.pl	2006-05-02 14:46:13 +02:00
+++ 1.94/mysql-test/mysql-test-run.pl	2006-05-03 20:04:54 +02:00
@@ -134,7 +134,6 @@
 our $glob_win32_perl=             0; # ActiveState Win32 Perl
 our $glob_cygwin_perl=            0; # Cygwin Perl
 our $glob_cygwin_shell=           undef;
-our $glob_use_libtool=            1;
 our $glob_mysql_test_dir=         undef;
 our $glob_mysql_bench_dir=        undef;
 our $glob_hostname=               undef;
@@ -444,13 +443,6 @@
   $glob_cygwin_perl= ($^O eq "cygwin");
   $glob_win32=       ($glob_win32_perl or $glob_cygwin_perl);
 
-  # Use libtool on all platforms except windows
-  if ( $glob_win32 )
-  {
-    $glob_use_libtool= 0;
-  }
-  $exe_libtool= "../libtool";
-
   # We require that we are in the "mysql-test" directory
   # to run mysql-test-run
 
@@ -1001,6 +993,21 @@
 
 sub executable_setup () {
 
+  #
+  # Check if libtool is available in this distribution/clone
+  # we need it when valgrinding or debugging non installed binary
+  # Otherwise valgrind will valgrind the libtool wrapper or bash
+  # and gdb will not find the real executable to debug
+  #
+  if ( -x "../libtool")
+  {
+    $exe_libtool= "../libtool";
+    if ($opt_valgrind or $glob_debugger)
+    {
+      mtr_report("Using \"$exe_libtool\" when running valgrind or debugger");
+    }
+  }
+
   if ( $opt_source_dist )
   {
     if ( $glob_win32 )
@@ -2626,7 +2633,7 @@
     $exe= undef;
   }
 
-  if ($glob_use_libtool and $opt_valgrind)
+  if ($exe_libtool and $opt_valgrind)
   {
     # Add "libtool --mode-execute"
     # if running in valgrind(to avoid valgrinding bash)
@@ -3132,7 +3139,7 @@
     debugger_arguments(\$args, \$exe, "client");
   }
 
-  if ($glob_use_libtool and $opt_valgrind)
+  if ($exe_libtool and $opt_valgrind)
   {
     # Add "libtool --mode-execute" before the test to execute
     # if running in valgrind(to avoid valgrinding bash)
@@ -3207,7 +3214,7 @@
   mtr_add_arg($$args, "$type");
   mtr_add_arg($$args, "-e");
 
-  if ( $glob_use_libtool )
+  if ( $exe_libtool )
   {
     mtr_add_arg($$args, $exe_libtool);
     mtr_add_arg($$args, "--mode=execute");
@@ -3270,7 +3277,7 @@
 
   my $save_exe= $$exe;
   $$args= [];
-  if ( $glob_use_libtool )
+  if ( $exe_libtool )
   {
     $$exe= $exe_libtool;
     mtr_add_arg($$args, "--mode=execute");