diff options
Diffstat (limited to 'mysql-test/suite/plugins/suite.pm')
| -rw-r--r-- | mysql-test/suite/plugins/suite.pm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/mysql-test/suite/plugins/suite.pm b/mysql-test/suite/plugins/suite.pm index a2ac3957af0..359a5409fa3 100644 --- a/mysql-test/suite/plugins/suite.pm +++ b/mysql-test/suite/plugins/suite.pm @@ -4,6 +4,13 @@ use My::Platform; @ISA = qw(My::Suite); +if (-d '../sql' && !&::using_extern()) { + my $src = "$::bindir/plugin/auth_pam/auth_pam_tool"; + my $dst = "$::plugindir/auth_pam_tool_dir/auth_pam_tool"; + ::mkpath( "$::plugindir/auth_pam_tool_dir"); + eval { symlink $src, $dst } or ::copy $src, $dst; +} + sub cassandra_running() { return 0 if IS_WINDOWS; system 'echo show version | cqlsh -3 2>/dev/null >/dev/null'; @@ -12,8 +19,10 @@ sub cassandra_running() { sub skip_combinations { my %skip; - $skip{'t/pam.test'} = 'No pam setup for mtr' + $skip{'t/pam_init.inc'} = 'No pam setup for mtr' unless -e '/etc/pam.d/mariadb_mtr'; + $skip{'t/pam_init.inc'} = 'Not run as user owning auth_pam_tool_dir' + unless -o $::plugindir . '/auth_pam_tool_dir'; $skip{'t/cassandra.test'} = 'Cassandra is not running' unless cassandra_running(); $skip{'t/cassandra_qcache.test'} = $skip{'t/cassandra.test'}; |