Commit d7d05682 authored by unknown's avatar unknown
Browse files

Fix mysql-test-run.pl for "bin dist" look in "bin" directory for client binaries as well. 


mysql-test/lib/mtr_misc.pl:
  Update comments
mysql-test/mysql-test-run.pl:
  Also need to look in "$glob_basedir/bin"
parent f337a747

mysql-test/lib/mtr_misc.pl

+21 −20
Original line number Diff line number Diff line
@@ -66,9 +66,10 @@ sub mtr_add_arg ($$@) { 


##############################################################################



# Note - More specific paths should be given before less specific.  For examle

# /client/debug should be listed before /client



#

# NOTE! More specific paths should be given before less specific.

# For example /client/debug should be listed before /client

#

sub mtr_path_exists (@) {

  foreach my $path ( @_ )

  {
@@ -84,9 +85,11 @@ sub mtr_path_exists (@) { 
  }

}



# Note - More specific paths should be given before less specific.  For examle

# /client/debug should be listed before /client



#

# NOTE! More specific paths should be given before less specific.

# For example /client/debug should be listed before /client

#

sub mtr_script_exists (@) {

  foreach my $path ( @_ )

  {
@@ -109,17 +112,11 @@ sub mtr_script_exists (@) { 
  }

}



sub mtr_file_exists (@) {

  foreach my $path ( @_ )

  {

    return $path if -e $path;

  }

  return "";

}



# Note - More specific paths should be given before less specific.  For examle

# /client/debug should be listed before /client



#

# NOTE! More specific paths should be given before less specific.

# For example /client/debug should be listed before /client

#

sub mtr_file_exists (@) {

  foreach my $path ( @_ )

  {
@@ -128,9 +125,11 @@ sub mtr_file_exists (@) { 
  return "";

}



# Note - More specific paths should be given before less specific.  For examle

# /client/debug should be listed before /client



#

# NOTE! More specific paths should be given before less specific.

# For example /client/debug should be listed before /client

#

sub mtr_exe_maybe_exists (@) {

  my @path= @_;
@@ -149,9 +148,11 @@ sub mtr_exe_maybe_exists (@) { 
  return "";

}



# Note - More specific paths should be given before less specific.  For examle

# /client/debug should be listed before /client



#

# NOTE! More specific paths should be given before less specific.

# For example /client/debug should be listed before /client

#

sub mtr_exe_exists (@) {

  my @path= @_;

  if (my $path= mtr_exe_maybe_exists(@path))

mysql-test/mysql-test-run.pl

+2 −1
Original line number Diff line number Diff line
@@ -670,7 +670,8 @@ sub command_line_setup () { 
  $path_client_bindir= mtr_path_exists(vs_config_dirs('client', ''),

				       "$glob_basedir/client_release",

				       "$glob_basedir/client_debug",

				       "$glob_basedir/client");

				       "$glob_basedir/client",

				       "$glob_basedir/bin");



  $exe_mysqld=         mtr_exe_exists (vs_config_dirs('sql', 'mysqld'),

				       "$glob_basedir/sql/mysqld",