dev-db/mariadb: Further refine tests to avoid false positives

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Brian Evans <grknight@gentoo.org>

diff --git a/dev-db/mariadb/mariadb-10.1.41.ebuild b/dev-db/mariadb/mariadb-10.1.41.ebuild
index cb8906ffaa551c3f1e1028b5f21fa5d98005aa6d..8a6a85ca423ad9c1da8e68208d75187ca8254ee7 100644 (file)
--- a/dev-db/mariadb/mariadb-10.1.41.ebuild
+++ b/dev-db/mariadb/mariadb-10.1.41.ebuild
@@ -569,15 +569,18 @@ src_test() {
        done
 
        for t in main.mysql_client_test main.mysql_client_test_nonblock \
-               rpl.rpl_semi_sync_uninstall_plugin \
+               rpl.rpl_semi_sync_uninstall_plugin main.mysql \
                main.mysql_client_test_comp rpl.rpl_extra_col_master_myisam ; do
                        _disable_test  "$t" "False positives in Gentoo"
        done
 
        if ! use client-libs ; then
                _disable_test main.plugin_auth "Needs client libraries built"
+               _disable_test plugins.auth_ed25519 "Needs client libraries built"
        fi
 
+       _disable_test main.gis_notembedded "Fails when latin1 USE is not set"
+
        _disable_test sys_vars.sysvars_server_notembedded "Broken test" # bug #661700 required profiling always on
 
        # run mysql-test tests

diff --git a/dev-db/mariadb/mariadb-10.2.26.ebuild b/dev-db/mariadb/mariadb-10.2.26.ebuild
index 21d67c3022621b3590501d56ec4679425c8937a0..5e2edb0efa6bbcc53b72666723ed8d0d131c2d8b 100644 (file)
--- a/dev-db/mariadb/mariadb-10.2.26.ebuild
+++ b/dev-db/mariadb/mariadb-10.2.26.ebuild
@@ -659,6 +659,7 @@ src_test() {
 
        _disable_test main.gis_notembedded "Needs latin1 USE set"
        _disable_test main.plugin_auth "Needs client libraries built"
+       _disable_test plugins.auth_ed25519 "Needs client libraries built"
        _disable_test main.mysqldump "Test fails past 2018-12-31 due to event expiration"
 
        # Likely environment issues as only number of clients connected fails

diff --git a/dev-db/mariadb/mariadb-10.3.17.ebuild b/dev-db/mariadb/mariadb-10.3.17.ebuild
index e502845dbd5d77054f0a9fcd48d34a05dd7cafe0..958d9f1cb1ed0f8783992c6e2c486bed4f8095a5 100644 (file)
--- a/dev-db/mariadb/mariadb-10.3.17.ebuild
+++ b/dev-db/mariadb/mariadb-10.3.17.ebuild
@@ -663,6 +663,7 @@ src_test() {
        done
 
        _disable_test main.plugin_auth "Needs client libraries built"
+       _disable_test plugins.auth_ed25519 "Needs client libraries built"
 
        _disable_test main.func_time "Dependent on time test was written"