Commit f27a0043 authored by Julius Goryavsky's avatar Julius Goryavsky

The test for the wsrep_info plugin needs the same flexible wsrep version...

The test for the wsrep_info plugin needs the same flexible wsrep version checking as the tests for Galera (continuation of MDEV-18565 task)
parent 6e98f681
...@@ -6,24 +6,14 @@ use My::Find; ...@@ -6,24 +6,14 @@ use My::Find;
return "Not run for embedded server" if $::opt_embedded_server; 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}, return "No wsrep provider library" unless ::have_wsrep_provider();
"/usr/lib/galera/libgalera_smm.so",
"/usr/lib64/galera/libgalera_smm.so";
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}; 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, push @::global_suppressions,
( (
qr(WSREP:.*down context.*), qr(WSREP:.*down context.*),
...@@ -38,11 +28,6 @@ push @::global_suppressions, ...@@ -38,11 +28,6 @@ push @::global_suppressions,
qr|WSREP: access file\(.*gvwstate.dat\) failed\(No such file or directory\)|, 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 } sub is_default { 1 }
bless { }; bless { };
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