At file:///home/psergey/bzr-new/maria-5.1-build2/ ------------------------------------------------------------ revno: 2767 revision-id: psergey@askmonty.org-20091007212904-81yqfkvgidlatwjc parent: psergey@askmonty.org-20091007210029-bxfk4r2xo0128uhq committer: Sergey Petrunya branch nick: maria-5.1-build2 timestamp: Thu 2009-10-08 01:29:04 +0400 message: 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 === modified file 'mysql-test/lib/mtr_cases.pm' --- a/mysql-test/lib/mtr_cases.pm 2009-09-07 20:50:10 +0000 +++ b/mysql-test/lib/mtr_cases.pm 2009-10-07 21:29:04 +0000 @@ -1082,6 +1082,17 @@ $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 if (defined $defaults_extra_file) { $tinfo->{extra_template_path}= $defaults_extra_file; @@ -1134,6 +1145,7 @@ ["federated.inc", "federated_test", 1], ["include/not_embedded.inc", "not_embedded", 1], ["include/not_valgrind.inc", "not_valgrind", 1], + ["include/have_example_plugin.inc", "example_plugin_test", 1] );