Skip to content
Permalink
Browse files

The test for the wsrep_info plugin needs the same flexible wsrep vers…

…ion checking as the tests for Galera (continuation of MDEV-18565 task)
  • Loading branch information...
Julius Goryavsky
Julius Goryavsky committed Jul 22, 2019
1 parent 6e98f68 commit f27a00435b244431b74615854dbbd31eae594782
Showing with 3 additions and 18 deletions.
  1. +3 −18 plugin/wsrep_info/mysql-test/wsrep_info/suite.pm
@@ -6,24 +6,14 @@ use My::Find;

return "Not run for embedded server" if $::opt_embedded_server;

return "WSREP is not compiled in" unless defined $::mysqld_variables{'wsrep-on'};
return "WSREP is not compiled in" if not ::have_wsrep();

my ($provider) = grep { -f $_ } $ENV{WSREP_PROVIDER},
"/usr/lib/galera/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so";
return "No wsrep provider library" unless ::have_wsrep_provider();

return "No wsrep provider library" unless -f $provider;
return ::wsrep_version_message() unless ::check_wsrep_version();

return "No WSREP_INFO plugin" unless $ENV{WSREP_INFO_SO};

$ENV{WSREP_PROVIDER} = $provider;

my ($spath) = grep { -f "$_/wsrep_sst_rsync"; } "$::bindir/scripts", $::path_client_bindir;
return "No SST scripts" unless $spath;

my ($epath) = grep { -f "$_/my_print_defaults"; } "$::bindir/extra", $::path_client_bindir;
return "No my_print_defaults" unless $epath;

push @::global_suppressions,
(
qr(WSREP:.*down context.*),
@@ -38,11 +28,6 @@ push @::global_suppressions,
qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|,
);


$ENV{PATH}="$epath:$ENV{PATH}";
$ENV{PATH}="$spath:$ENV{PATH}" unless $epath eq $spath;

sub is_default { 1 }

bless { };

0 comments on commit f27a004

Please sign in to comment.
You can’t perform that action at this time.