database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

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

Browse Source
This commit is contained in:
msvensson@neptunus.(none)
2006-11-03 12:32:05 +01:00
parent 580b540d25
commit 7b4a8e41a6
2 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mysql-test/lib/mtr_misc.pl
View File

@@ -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 (@) { sub mtr_path_exists (@) {
foreach my $path ( @_ ) 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 (@) { sub mtr_script_exists (@) {
foreach my $path ( @_ ) foreach my $path ( @_ )
{ {
@@ -109,6 +112,11 @@ sub mtr_script_exists (@) {
} }
} }
#
# NOTE! More specific paths should be given before less specific.
# For example /client/debug should be listed before /client
#
sub mtr_file_exists (@) { sub mtr_file_exists (@) {
foreach my $path ( @_ ) foreach my $path ( @_ )
{ {
@@ -117,20 +125,11 @@ sub mtr_file_exists (@) {
return ""; return "";
} }
# Note - More specific paths should be given before less specific. For examle
# /client/debug should be listed before /client
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_exe_maybe_exists (@) { sub mtr_exe_maybe_exists (@) {
my @path= @_; my @path= @_;
@@ -149,9 +148,11 @@ sub mtr_exe_maybe_exists (@) {
return ""; 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 (@) { sub mtr_exe_exists (@) {
my @path= @_; my @path= @_;
if (my $path= mtr_exe_maybe_exists(@path)) if (my $path= mtr_exe_maybe_exists(@path))
@@ -174,7 +175,7 @@ sub mtr_copy_dir($$) {
my $from_dir= shift; my $from_dir= shift;
my $to_dir= shift; my $to_dir= shift;
# mtr_verbose("Copying from $from_dir to $to_dir"); # mtr_verbose("Copying from $from_dir to $to_dir");
mkpath("$to_dir"); mkpath("$to_dir");
opendir(DIR, "$from_dir") opendir(DIR, "$from_dir")

3
mysql-test/mysql-test-run.pl
View File

@@ -670,7 +670,8 @@ sub command_line_setup () {
$path_client_bindir= mtr_path_exists(vs_config_dirs('client', ''), $path_client_bindir= mtr_path_exists(vs_config_dirs('client', ''),
"$glob_basedir/client_release", "$glob_basedir/client_release",
"$glob_basedir/client_debug", "$glob_basedir/client_debug",
"$glob_basedir/client"); "$glob_basedir/client",
"$glob_basedir/bin");
$exe_mysqld= mtr_exe_exists (vs_config_dirs('sql', 'mysqld'), $exe_mysqld= mtr_exe_exists (vs_config_dirs('sql', 'mysqld'),
"$glob_basedir/sql/mysqld", "$glob_basedir/sql/mysqld",