gentoo auto-resync : 25:09:2022 - 05:33:00

3 files changed, 50 insertions, 2 deletions

diff --git a/dev-db/mariadb-connector-c/Manifest b/dev-db/mariadb-connector-c/Manifest
index 96546a012b6d..c9cfddfc9597 100644
--- a/dev-db/mariadb-connector-c/Manifest
+++ b/dev-db/mariadb-connector-c/Manifest
@@ -3,6 +3,6 @@ AUX mariadb-connector-c-3.1.3-fix-pkconfig-file.patch 616 BLAKE2B 650c5a794da6d3
 DIST mariadb-connector-c-3.1.13-src.tar.gz 968401 BLAKE2B 4b7270c5e86e0a39773f38fbf1b4334ed9fdfca65432a5858b7e591fca5d6a68fd5a0eead96a6c9bfab22f49416d9c19c8a4c5c3fc328d16702c6051116e9a01 SHA512 a179a4fa689f681d64f926c1f3abfd3912896ec3e39c15be6a330647ded207aa2f110277dc43b90faffa4386365a72babc96264e29ac436e5d212d8b7cef7c32
 DIST mariadb-connector-c-3.2.5-src.tar.gz 992580 BLAKE2B c850dfbb2241e78475b5f9e9aa0fcb69bc9cc0d17a9092da36e720ec63e3fbdb0add32e6c4508a136fcb43d0825bea7346c0d6ce8a40ae10357ef3d3b6b7bea0 SHA512 5068c95ff15969c6b1d0e2e095fe0bdca3382f478012c852a9745a9bbbfc7586b1eeaa93a55fbadb236499a336133667f4638082814c97ff6b3bbc750c5e59dc
 EBUILD mariadb-connector-c-3.1.13.ebuild 2075 BLAKE2B 7630d175e9b2601ce4698f8ce76a90fd74919e7a88b08fb896b779be12ed2cca55bce66f6f36a9eb37acab0c6d6afe231dd238597c88235b341e9c9fe1088cf4 SHA512 c5ca7f78b640767b14927546cc67ef8a2dd12355f25abaceed29addbfb234bbaf34183e8cb309da917ca1cfb5043708ac8b0f577e75028cfe6593b08b8a9fa83
-EBUILD mariadb-connector-c-3.2.5.ebuild 2084 BLAKE2B 72be38d1219b801ef6b86b49e22adab4bee2df00ac03e92d23035fca1d707b5954b0621d4a1f98fa8530edb1a6b10c78d11f893d9553b6e15ff3232bb974e236 SHA512 6fe41393d3eb5e96318100ccdbd1f5aa44f3a32f80c02dbfb95fe20a5603ec176477d55c97627cb47770c86b609c5e7f1037521bf82ccf38e6e44d60ff5f4319
-EBUILD mariadb-connector-c-9999.ebuild 2090 BLAKE2B bdac01b7202eb1fb998411bf22e570deb43ad05d4ead8ee5bb4547493ae59a4c50f972595295dd2aead36fc00658692b9338f94896d3ba3ca58238d3ed98d0de SHA512 f5503942d0205d377cc86ca1c3274ed1624ba1e15d91ac484ca2f2a72d01a2d0bf27c61fee8e517b564de34e7127d91255de0efb6572ba58958498672dcbdb64
+EBUILD mariadb-connector-c-3.2.5.ebuild 3426 BLAKE2B d7be2e66e6b9aed0a524fdee3a504c81ce094885dbc3185310f2dddf9bb7c1ee2d0a774724680ef970f168f6b43ac4e725436c593b6b58c092989f18f3c52597 SHA512 a1f1f5bef90a87d94d41385a216d8bfd8e1a10967b7703f5b314238b70de3f7fd498ac71ea0fe1de8aa80efd0131d154f32b8bdf8d7006bb1dd37ddaf1c811b3
+EBUILD mariadb-connector-c-9999.ebuild 3432 BLAKE2B 524853571cfca22510a952f196be08dc2a598a70688a4db5b1c01e9d971ed77fc4ceead4074ddf8504dbf72e5354cee8112f2e97d3d5088b2a31f8eb31dd3a68 SHA512 51356292ce94046b4cb444c8b43402a5c069a820b732e2f4a156c9e7af7a21d978cdab339a53e5f161b3d8cfd08ac2347aa14e4688270eeb73e021dfbf37fa25
 MISC metadata.xml 244 BLAKE2B 4123aca5430915cc6801ba9b4e57e1ff48f31a4bacaa785c4dfbbf2d1aadf14f274684cad9b24a09e875a7f621b33bd9bd3333f7ababbd44aa173d4ace98b46e SHA512 380cbd85bebb869f4a2ec1e3518dc6ac5abed1fa5364172e7436098dbd910e738c4d59ee18aa7cf387b354020ed5782732e43702dc83c1857d46b720d623143d
diff --git a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
index f5de26435990..17e775c57359 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-3.2.5.ebuild
@@ -43,12 +43,28 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 		)
 	)
 	"
+BDEPEND="test? ( dev-db/mariadb[server] )"
 RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/gentoo-layout-3.0.patch
 	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
 )
 
+src_prepare() {
+	# These tests the remote_io plugin which requires network access
+	sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, NULL},//g' "unittest/libmariadb/misc.c" || die
+
+	# These tests don't work with --skip-grant-tables
+	sed -i 's/{"test_conc366", test_conc366, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
+	sed -i 's/{"test_conc66", test_conc66, TEST_CONNECTION_DEFAULT, 0, NULL,  NULL},//g' "unittest/libmariadb/connection.c" || die
+
+	# [Warning] Aborted connection 2078 to db: 'test' user: 'root' host: '' (Got an error reading communication packets)
+	# Not sure about this one - might also require network access
+	sed -i 's/{"test_default_auth", test_default_auth, TEST_CONNECTION_NONE, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
+
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	# bug 508724 mariadb cannot use ld.gold
 	tc-ld-disable-gold
@@ -70,6 +86,14 @@ multilib_src_configure() {
 	cmake_src_configure
 }
 
+multilib_src_test() {
+	mkdir -vp "${T}/mysql/data" || die
+	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 sleep 1 ; done
+	cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
+}
+
 multilib_src_install_all() {
 	if ! use static-libs ; then
 		find "${ED}" -name "*.a" -delete || die
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 f31b6bb77e17..9799342c7442 100644
--- a/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
+++ b/dev-db/mariadb-connector-c/mariadb-connector-c-9999.ebuild
@@ -43,12 +43,28 @@ DEPEND="sys-libs/zlib:=[${MULTILIB_USEDEP}]
 		)
 	)
 	"
+BDEPEND="test? ( dev-db/mariadb[server] )"
 RDEPEND="${DEPEND}"
 PATCHES=(
 	"${FILESDIR}"/gentoo-layout-3.0.patch
 	"${FILESDIR}"/${PN}-3.1.3-fix-pkconfig-file.patch
 )
 
+src_prepare() {
+	# These tests the remote_io plugin which requires network access
+	sed -i 's/{"test_remote1", test_remote1, TEST_CONNECTION_NEW, 0, NULL, NULL},//g' "unittest/libmariadb/misc.c" || die
+
+	# These tests don't work with --skip-grant-tables
+	sed -i 's/{"test_conc366", test_conc366, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
+	sed -i 's/{"test_conc66", test_conc66, TEST_CONNECTION_DEFAULT, 0, NULL,  NULL},//g' "unittest/libmariadb/connection.c" || die
+
+	# [Warning] Aborted connection 2078 to db: 'test' user: 'root' host: '' (Got an error reading communication packets)
+	# Not sure about this one - might also require network access
+	sed -i 's/{"test_default_auth", test_default_auth, TEST_CONNECTION_NONE, 0, NULL, NULL},//g' "unittest/libmariadb/connection.c" || die
+
+	cmake_src_prepare
+}
+
 multilib_src_configure() {
 	# bug 508724 mariadb cannot use ld.gold
 	tc-ld-disable-gold
@@ -70,6 +86,14 @@ multilib_src_configure() {
 	cmake_src_configure
 }
 
+multilib_src_test() {
+	mkdir -vp "${T}/mysql/data" || die
+	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 sleep 1 ; done
+	cd unittest/libmariadb && MYSQL_TEST_SOCKET="${T}/mysql/mysql.sock" MARIADB_CC_TEST=1 ctest --verbose || die
+}
+
 multilib_src_install_all() {
 	if ! use static-libs ; then
 		find "${ED}" -name "*.a" -delete || die