Apply patch

parent d8b8f944
...@@ -65,6 +65,7 @@ our $basedir; ...@@ -65,6 +65,7 @@ our $basedir;
our $path_charsetsdir; our $path_charsetsdir;
our $path_client_bindir; our $path_client_bindir;
our $path_client_libdir;
our $path_language; our $path_language;
our $path_current_testlog; our $path_current_testlog;
...@@ -358,6 +359,8 @@ sub command_line_setup { ...@@ -358,6 +359,8 @@ sub command_line_setup {
'tmpdir=s' => \$opt_tmpdir, 'tmpdir=s' => \$opt_tmpdir,
'vardir=s' => \$opt_vardir, 'vardir=s' => \$opt_vardir,
'mem' => \$opt_mem, 'mem' => \$opt_mem,
'client-bindir=s' => \$path_client_bindir,
'client-libdir=s' => \$path_client_libdir,
# Misc # Misc
'report-features' => \$opt_report_features, 'report-features' => \$opt_report_features,
...@@ -426,11 +429,19 @@ sub command_line_setup { ...@@ -426,11 +429,19 @@ sub command_line_setup {
# #
# Look for the client binaries directory # Look for the client binaries directory
if ($path_client_bindir)
{
# --client-bindir=path set on command line, check that the path exists
$path_client_bindir= mtr_path_exists($path_client_bindir);
}
else
{
$path_client_bindir= mtr_path_exists("$basedir/client_release", $path_client_bindir= mtr_path_exists("$basedir/client_release",
"$basedir/client_debug", "$basedir/client_debug",
vs_config_dirs('client', ''), vs_config_dirs('client', ''),
"$basedir/client", "$basedir/client",
"$basedir/bin"); "$basedir/bin");
}
# Look for language files and charsetsdir, use same share # Look for language files and charsetsdir, use same share
my $path_share= mtr_path_exists("$basedir/share/mysql", my $path_share= mtr_path_exists("$basedir/share/mysql",
...@@ -1066,10 +1077,15 @@ sub environment_setup { ...@@ -1066,10 +1077,15 @@ sub environment_setup {
my @ld_library_paths; my @ld_library_paths;
# -------------------------------------------------------------------------- if ($path_client_libdir)
{
# Use the --client-libdir passed on commandline
push(@ld_library_paths, "$path_client_libdir");
}
else
{
# Setup LD_LIBRARY_PATH so the libraries from this distro/clone # Setup LD_LIBRARY_PATH so the libraries from this distro/clone
# are used in favor of the system installed ones # are used in favor of the system installed ones
# --------------------------------------------------------------------------
if ( $source_dist ) if ( $source_dist )
{ {
push(@ld_library_paths, "$basedir/libmysql/.libs/", push(@ld_library_paths, "$basedir/libmysql/.libs/",
...@@ -1080,6 +1096,7 @@ sub environment_setup { ...@@ -1080,6 +1096,7 @@ sub environment_setup {
{ {
push(@ld_library_paths, "$basedir/lib"); push(@ld_library_paths, "$basedir/lib");
} }
}
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Add the path where libndbclient can be found # Add the path where libndbclient can be found
...@@ -3614,6 +3631,9 @@ Options to control directories to use ...@@ -3614,6 +3631,9 @@ Options to control directories to use
for tmpfs (/dev/shm) for tmpfs (/dev/shm)
The option can also be set using environment The option can also be set using environment
variable MTR_MEM=[DIR] variable MTR_MEM=[DIR]
client-bindir=PATH Path to the directory where client binaries are located
client-libdir=PATH Path to the directory where client libraries are located
Options to control what test suites or cases to run Options to control what test suites or cases to run
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment