From d84792b689e753b22d4127ff45119951ff14108b Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 1 Jul 2019 23:03:16 +0200 Subject: [PATCH] Skip pam tests unless $USER owns auth_pam_tool_dir (meaning, if MariaDB is installed system-wide, pam tests require mtr to be run as mysql user) --- mysql-test/suite/plugins/suite.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mysql-test/suite/plugins/suite.pm b/mysql-test/suite/plugins/suite.pm index cb42fb66705..59d0603adfc 100644 --- a/mysql-test/suite/plugins/suite.pm +++ b/mysql-test/suite/plugins/suite.pm @@ -14,6 +14,8 @@ sub skip_combinations { my %skip; $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'};