Commit 43305056 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Do not use File::Which, it is not always available.

parent 72407e54
...@@ -3,7 +3,6 @@ package My::Suite::MariaBackup; ...@@ -3,7 +3,6 @@ package My::Suite::MariaBackup;
@ISA = qw(My::Suite); @ISA = qw(My::Suite);
use My::Find; use My::Find;
use File::Basename; use File::Basename;
use File::Which;
use strict; use strict;
return "Not run for embedded server" if $::opt_embedded_server; return "Not run for embedded server" if $::opt_embedded_server;
...@@ -24,10 +23,13 @@ $ENV{XBSTREAM}= ::mtr_exe_maybe_exists( ...@@ -24,10 +23,13 @@ $ENV{XBSTREAM}= ::mtr_exe_maybe_exists(
$ENV{INNOBACKUPEX}= "$mariabackup_exe --innobackupex"; $ENV{INNOBACKUPEX}= "$mariabackup_exe --innobackupex";
my $have_qpress = index(`qpress 2>&1`,"Compression") > 0;
sub skip_combinations { sub skip_combinations {
my %skip; my %skip;
$skip{'include/have_file_key_management.inc'} = 'needs file_key_management plugin' unless $ENV{FILE_KEY_MANAGEMENT_SO}; $skip{'include/have_file_key_management.inc'} = 'needs file_key_management plugin' unless $ENV{FILE_KEY_MANAGEMENT_SO};
$skip{'compress_qpress.test'}= 'needs qpress executable in PATH' unless which 'qpress'; $skip{'compress_qpress.test'}= 'needs qpress executable in PATH' unless $have_qpress;
%skip; %skip;
} }
......
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