diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-10-23 14:17:50 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-10-23 14:17:50 +0000 |
| commit | 433050562965d83228bcab0d39c8ec64058fe8e3 (patch) | |
| tree | acdf07a6f1f2abf5553f6947956eb3e5ccfbe78c /mysql-test | |
| parent | 72407e544e27fdef2e99434e026d168dd58bfce6 (diff) | |
| download | mariadb-git-433050562965d83228bcab0d39c8ec64058fe8e3.tar.gz | |
Do not use File::Which, it is not always available.
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/suite/mariabackup/suite.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mysql-test/suite/mariabackup/suite.pm b/mysql-test/suite/mariabackup/suite.pm index b96b8a6c39d..9242bbc051f 100644 --- a/mysql-test/suite/mariabackup/suite.pm +++ b/mysql-test/suite/mariabackup/suite.pm @@ -3,7 +3,6 @@ package My::Suite::MariaBackup; @ISA = qw(My::Suite); use My::Find; use File::Basename; -use File::Which; use strict; return "Not run for embedded server" if $::opt_embedded_server; @@ -24,10 +23,13 @@ $ENV{XBSTREAM}= ::mtr_exe_maybe_exists( $ENV{INNOBACKUPEX}= "$mariabackup_exe --innobackupex"; +my $have_qpress = index(`qpress 2>&1`,"Compression") > 0; + + sub skip_combinations { my %skip; $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; } |