From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1707386-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 20ADA15813A
for <garchives@archives.gentoo.org>; Thu, 09 Jan 2025 03:26:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 5ED29E0636;
Thu, 09 Jan 2025 03:26:21 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id AF9FEE0636
for <gentoo-commits@lists.gentoo.org>; Thu, 09 Jan 2025 03:26:18 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D940F335DC7
for <gentoo-commits@lists.gentoo.org>; Thu, 09 Jan 2025 03:26:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F14011B5
for <gentoo-commits@lists.gentoo.org>; Thu, 09 Jan 2025 03:26:16 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1736393125.506481663946acf3d4522593975a763cdaf0f5e0.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/mariadb-connector-c/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
X-VCS-Directories: dev-db/mariadb-connector-c/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 506481663946acf3d4522593975a763cdaf0f5e0
X-VCS-Branch: master
Date: Thu, 09 Jan 2025 03:26:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 21c511a6-ceb5-418f-9743-2860fb88ecd4
X-Archives-Hash: af9355e1a2e981af9461439d740eaa57
commit: 506481663946acf3d4522593975a763cdaf0f5e0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 9 03:25:25 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jan 9 03:25:25 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50648166
dev-db/mariadb-connector-c: pass --no-defaults to mysqladmin too
Closes: https://bugs.gentoo.org/942287
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-db/mariadb-connector-c/mariadb-connector-c-3.3.8.ebuild | 2 +-
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