Commit 538d689f authored by Sergey Petrunya's avatar Sergey Petrunya

MBUG#442254: mysql-test-run --embedded fails on Windows with: ERROR: .opt file...

MBUG#442254: mysql-test-run --embedded fails on Windows with: ERROR: .opt file references 'EXAMPLE_PLUGIN_OPT'
- Fix suggested by Kristian on review: ignore the test using mtr's facilities

parent d1d978dd
...@@ -1082,6 +1082,17 @@ sub collect_one_test_case { ...@@ -1082,6 +1082,17 @@ sub collect_one_test_case {
$tinfo->{template_path}= $config; $tinfo->{template_path}= $config;
} }
if ( $tinfo->{'example_plugin_test'} )
{
if ( !$ENV{'EXAMPLE_PLUGIN'} )
{
$tinfo->{'skip'}= 1;
$tinfo->{'comment'}= "Test requires the 'example' plugin";
return $tinfo;
}
}
# Set extra config file to use # Set extra config file to use
if (defined $defaults_extra_file) { if (defined $defaults_extra_file) {
$tinfo->{extra_template_path}= $defaults_extra_file; $tinfo->{extra_template_path}= $defaults_extra_file;
...@@ -1134,6 +1145,7 @@ my @tags= ...@@ -1134,6 +1145,7 @@ my @tags=
["federated.inc", "federated_test", 1], ["federated.inc", "federated_test", 1],
["include/not_embedded.inc", "not_embedded", 1], ["include/not_embedded.inc", "not_embedded", 1],
["include/not_valgrind.inc", "not_valgrind", 1], ["include/not_valgrind.inc", "not_valgrind", 1],
["include/have_example_plugin.inc", "example_plugin_test", 1]
); );
......
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