mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
Fix running test suite from installed directory rather than source directory.
Fix trivial typo in BUILD/* scripts. BUILD/SETUP.sh: Fix typo. mysql-test/mysql-test-run.pl: Fix mysql-test-run.pl to be able to find plugins used in testing also when running the test suite from an installed mysqld package.
This commit is contained in:
@ -1886,7 +1886,8 @@ sub environment_setup {
|
||||
# --------------------------------------------------------------------------
|
||||
my $lib_udf_example=
|
||||
mtr_file_exists(vs_config_dirs('sql', 'udf_example.dll'),
|
||||
"$basedir/sql/.libs/udf_example.so",);
|
||||
"$basedir/sql/.libs/udf_example.so",
|
||||
"$basedir/lib/mysql/plugin/udf_example.so",);
|
||||
|
||||
if ( $lib_udf_example )
|
||||
{
|
||||
@ -1913,7 +1914,8 @@ sub environment_setup {
|
||||
}
|
||||
my $lib_example_plugin=
|
||||
mtr_file_exists(vs_config_dirs('storage/example',$plugin_filename),
|
||||
"$basedir/storage/example/.libs/".$plugin_filename);
|
||||
"$basedir/storage/example/.libs/".$plugin_filename,
|
||||
"$basedir/lib/mysql/plugin/".$plugin_filename);
|
||||
$ENV{'EXAMPLE_PLUGIN'}=
|
||||
($lib_example_plugin ? basename($lib_example_plugin) : "");
|
||||
$ENV{'EXAMPLE_PLUGIN_OPT'}= "--plugin-dir=".
|
||||
@ -1928,7 +1930,8 @@ sub environment_setup {
|
||||
# ----------------------------------------------------
|
||||
my $lib_simple_parser=
|
||||
mtr_file_exists(vs_config_dirs('plugin/fulltext', 'mypluglib.dll'),
|
||||
"$basedir/plugin/fulltext/.libs/mypluglib.so",);
|
||||
"$basedir/plugin/fulltext/.libs/mypluglib.so",
|
||||
"$basedir/lib/mysql/plugin/mypluglib.so",);
|
||||
|
||||
$ENV{'SIMPLE_PARSER'}=
|
||||
($lib_simple_parser ? basename($lib_simple_parser) : "");
|
||||
|
Reference in New Issue
Block a user