diff options
Diffstat (limited to 'dev-db/mariadb-connector-c')
| -rw-r--r-- | dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild | 2 | ||||
| -rw-r--r-- | dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild index eb4f7ef8cec1..fdf4b945fa06 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild @@ -109,7 +109,7 @@ multilib_src_test() { mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking & local attempts=0 - while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do + while ! mysqladmin ping --no-defaults --socket="${T}/mysql/mysql.sock" --silent ; do # 5 minutes should be more than enough if [[ ${attempts} -gt 300 ]] ; then die "mysqld not found after 300 seconds, aborting" diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild index 45553edc1b5e..16f992e304e8 100644 --- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild +++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -108,8 +108,15 @@ multilib_src_test() { mysql_install_db --no-defaults --datadir="${T}/mysql/data" || die mysqld --no-defaults --datadir="${T}/mysql/data" --socket="${T}/mysql/mysql.sock" --skip-grant-tables --skip-networking & - while ! mysqladmin ping --socket="${T}/mysql/mysql.sock" --silent ; do + local attempts=0 + while ! mysqladmin ping --no-defaults --socket="${T}/mysql/mysql.sock" --silent ; do + # 5 minutes should be more than enough + if [[ ${attempts} -gt 300 ]] ; then + die "mysqld not found after 300 seconds, aborting" + fi + sleep 1 + attempts=$((attempts + 1)) done cd unittest/libmariadb || die |