From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
	by finch.gentoo.org with esmtp (Exim 4.60)
	(envelope-from <gentoo-commits+bounces-446876-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1SFtUr-00032M-6L
	for garchives@archives.gentoo.org; Thu, 05 Apr 2012 20:41:33 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7EB8CE0C77;
	Thu,  5 Apr 2012 20:41:22 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 3F772E0C77
	for <gentoo-commits@lists.gentoo.org>; Thu,  5 Apr 2012 20:41:22 +0000 (UTC)
Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 752C31B4052
	for <gentoo-commits@lists.gentoo.org>; Thu,  5 Apr 2012 20:41:21 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
	by hornbill.gentoo.org (Postfix) with ESMTP id 369A2E542C
	for <gentoo-commits@lists.gentoo.org>; Thu,  5 Apr 2012 20:41:20 +0000 (UTC)
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" <robbat2@gentoo.org>
Message-ID: <1333357517.bd4e937a49bde6db34a6c7aea8a7d74c579f471b.robbat2@gentoo>
Subject: [gentoo-commits] proj/mysql:master commit in: dev-db/mariadb/
X-VCS-Repository: proj/mysql
X-VCS-Files: dev-db/mariadb/Manifest dev-db/mariadb/mariadb-5.3.5.ebuild dev-db/mariadb/mariadb-5.5.22.ebuild
X-VCS-Directories: dev-db/mariadb/
X-VCS-Committer: robbat2
X-VCS-Committer-Name: Robin H. Johnson
X-VCS-Revision: bd4e937a49bde6db34a6c7aea8a7d74c579f471b
X-VCS-Branch: master
Date: Thu,  5 Apr 2012 20:41:20 +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
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 7f03e784-3d66-4139-be18-5a785b6713d9
X-Archives-Hash: a961000c22c289be0720eed4a714dd8e

commit:     bd4e937a49bde6db34a6c7aea8a7d74c579f471b
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr  2 09:05:17 2012 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Apr  2 09:05:17 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=3Dproj/mysql.git;a=3D=
commit;h=3Dbd4e937a

Bump.

(Portage version: 2.2.0_alpha93/git/Linux x86_64, unsigned Manifest commi=
t)

---
 dev-db/mariadb/Manifest              |    4 +
 dev-db/mariadb/mariadb-5.3.5.ebuild  |  174 ++++++++++++++++++++++++++++=
++++++
 dev-db/mariadb/mariadb-5.5.22.ebuild |  171 ++++++++++++++++++++++++++++=
+++++
 3 files changed, 349 insertions(+), 0 deletions(-)

diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest
index 6559d5b..7545171 100644
--- a/dev-db/mariadb/Manifest
+++ b/dev-db/mariadb/Manifest
@@ -8,6 +8,8 @@ DIST mariadb-5.2.9.tar.gz 25107185 RMD160 23f89e13ec9b9f7=
31f42ba65f40ea07ad21a44
 DIST mariadb-5.3.0-beta.tar.gz 26244818 RMD160 dab35f3f2e9668235f016e564=
559ebf62a11755f SHA1 2442be2c9d13c1c9f9bcb7d3edfbda09373f6297 SHA256 d448=
8147c6722cc869b017e8f9f1af72bbb1f385e63bf8adc3f141b783437b6a
 DIST mariadb-5.3.1-beta.tar.gz 26294191 RMD160 8c7841d03867170c05fa53931=
e5578c5dc5907c9 SHA1 6c75f95afe57d2e67925277f5bedb50bd97d81e1 SHA256 bf95=
a1f901feea88a2cb8aea08ce880c15f5ae6f1b1466e490ee83c37bfbf6ad
 DIST mariadb-5.3.3-rc.tar.gz 26578753 RMD160 0a4636259fe86dd6367e35bfd15=
895eab2b617ba SHA1 2a42cab846bd141847ef7262187921949c9d02e0 SHA256 7f697f=
38178b768fccb6a7b30ffd30a9c961baf9ed443254e924e7774fd36cf2
+DIST mariadb-5.3.5-ga.tar.gz 26610363 RMD160 cd8ae9513d420c9855d2b77bc88=
26867f353b72c SHA1 a5487491ddc1477a48227f511ffd74f7cd719b3e SHA256 8b90d5=
2d48de27f43b3f5480fdda80868b9122a11ffa69b5df485a0c857378f3
+DIST mariadb-5.5.22.tar.gz 27412188 RMD160 8fa7685d5e1dec5230f767b7d274a=
a37f633f98a SHA1 c14fb9eac51da6a67c2e285d9094cdff6ce9110f SHA256 6acf93b7=
cb7159fa5e969698653704023da81b71f5cfd6062977aecbf0c8d016
 DIST mysql-extras-20110426-1046Z.tar.bz2 1312102 RMD160 4971583f7f6737c2=
f0863b3cea38ed3d995036ef SHA1 e614c46a756425ce5e602d1a3cd807b3699ca1cb SH=
A256 e49636b2527d96bc4fe6d2143b00af47c63202ad999fed332a544aa6b7b1ffa8
 DIST mysql-extras-20110819-0415Z.tar.bz2 1734262 RMD160 88ba7cd1ccc35b2f=
b526257e46f4169afc9fafaa SHA1 996c4e9a22c454b255856228c30bb3a9ea56a443 SH=
A256 f2749639669d458ae59c6eb3134f5c2689219281ee4f4d33fdc525a19d456a5f
 EBUILD mariadb-5.1.55.ebuild 6034 RMD160 1e23e5a75da6368b71db55588b7191e=
44cfeb7bd SHA1 4dd5d1bd12915d3ba2d0f0294edf21c94e8b58a4 SHA256 cee0c000aa=
4da141ba1da2605864d8a2ba73003e218d9adebb4e9b70be6f2386
@@ -18,5 +20,7 @@ EBUILD mariadb-5.2.9.ebuild 5901 RMD160 efb76b77e9f8301=
b97f23c3d6d00253a7a01cee0
 EBUILD mariadb-5.3.0_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a21162182=
2c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 150780=
6ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
 EBUILD mariadb-5.3.1_beta.ebuild 5889 RMD160 0c5c0076c8688fbd76a21162182=
2c0707954856e SHA1 c277aebe22933ba0fe69b1afb85dc3083279d08e SHA256 150780=
6ef15e9444ce59355799c721c8f124c2e70a842bdefd2744e8060b3ac6
 EBUILD mariadb-5.3.3_rc.ebuild 5889 RMD160 88bb9385cec8fd77e86bf2152b515=
c6f160023ff SHA1 e3a71b5c909f9bcc6f9d01b4f9b887360904235b SHA256 454524f3=
7fbb85d52d75167079c74d2abf1444e22fd4cbee654301cabcf3e971
+EBUILD mariadb-5.3.5.ebuild 5926 RMD160 f48e97453fce863fa2315aac8df68833=
45836140 SHA1 6e73eb40e4b2945d97be2fbdc10db7c5db940322 SHA256 7a27c01ed18=
fb9ea890a3581b17f605d194a50aa809b9f08552a3a59d1ac8382
+EBUILD mariadb-5.5.22.ebuild 5885 RMD160 bd589ea7d8f9f9f51284b259c24e461=
a2f0ea41b SHA1 f353cae595b5184dbb5514c8238acb4b1da22eca SHA256 a9cef0c80d=
c97ec6085c8c729b22078d3f51d51ef852218a7e51fef4be0c91e1
 MISC ChangeLog 4748 RMD160 fd1104bc4093238a078829d99f699f7cb7bf5592 SHA1=
 e1522463c7b327d50bf231bd78951669d89534f3 SHA256 af66e5983ec5f17648e82ebb=
8b50685a2b8ec7f1fa45d3db92ad29bad7dc5592
 MISC metadata.xml 1378 RMD160 50cdbdcabfafd504bed5cbfa5bf19466d5b762ca S=
HA1 bb93129383b64cfd888d313dc0dea6fa719a3367 SHA256 6736d49da017b0d2d5c6e=
77068ae66b57ce231c54a253eb8951dc5ad64a6258a

diff --git a/dev-db/mariadb/mariadb-5.3.5.ebuild b/dev-db/mariadb/mariadb=
-5.3.5.ebuild
new file mode 100644
index 0000000..573efa2
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.3.5.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER=3D"20110819-0415Z"
+EAPI=3D"4"
+
+# Build system
+BUILD=3D"autotools"
+
+# Suffix on files...
+MY_PV=3D"$PV-ga"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE=3D"$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS=3D"~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these=
.
+EPATCH_EXCLUDE=3D''
+
+DEPEND=3D"|| ( >=3Dsys-devel/gcc-3.4.6 >=3Dsys-devel/gcc-apple-4.0 )"
+RDEPEND=3D"${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE=3D'berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES=3D'test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" =3D=3D "localhost" ]] && die "Your machine must NOT be=
 named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=3D-userpriv is no longer supported by upst=
ream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=
=3Dusersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD=3D"$((${RANDOM} % 100))"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to rege=
n
+		# ourselves. Alternatively, upstream should generate them with at leas=
t
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.1.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_k=
ey \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers=
:
+		# fails due to USE=3D-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mas=
k
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.2.*|5.3.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere=
,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" =3D=3D "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=3D$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force=3D"--force --vardir=3D${S}/mysql-test/var-ns"
+		retstatus_ns=3D$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=
=3Dusersandbox"
+
+		emake test-ps force=3D"--force --vardir=3D${S}/mysql-test/var-ps"
+		retstatus_ps=3D$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=
=3Dusersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as wel=
l.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=3D""
+		[[ $retstatus_unit -eq 0 ]] || failures=3D"${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures=3D"${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures=3D"${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=
=3Dusersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}

diff --git a/dev-db/mariadb/mariadb-5.5.22.ebuild b/dev-db/mariadb/mariad=
b-5.5.22.ebuild
new file mode 100644
index 0000000..411f56a
--- /dev/null
+++ b/dev-db/mariadb/mariadb-5.5.22.ebuild
@@ -0,0 +1,171 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+MY_EXTRAS_VER=3D"20110819-0415Z"
+EAPI=3D"4"
+
+# Build system
+BUILD=3D"cmake"
+
+inherit toolchain-funcs mysql-v2
+# only to make repoman happy. it is really set in the eclass
+IUSE=3D"$IUSE"
+
+# REMEMBER: also update eclass/mysql*.eclass before committing!
+KEYWORDS=3D"~amd64 ~s390 ~sh ~x86 ~sparc-fbsd ~x86-fbsd"
+
+# When MY_EXTRAS is bumped, the index should be revised to exclude these=
.
+EPATCH_EXCLUDE=3D''
+
+DEPEND=3D"|| ( >=3Dsys-devel/gcc-3.4.6 >=3Dsys-devel/gcc-apple-4.0 )"
+RDEPEND=3D"${RDEPEND}"
+
+# Please do not add a naive src_unpack to this ebuild
+# If you want to add a single patch, copy the ebuild to an overlay
+# and create your own mysql-extras tarball, looking at 000_index.txt
+src_prepare() {
+	sed -i \
+		-e '/^noinst_PROGRAMS/s/basic-t//g' \
+		"${S}"/unittest/mytap/t/Makefile.am
+	mysql-v2_src_prepare
+}
+
+# Official test instructions:
+# USE=3D'berkdb -cluster embedded extraengine perl ssl community' \
+# FEATURES=3D'test userpriv -usersandbox' \
+# ebuild mariadb-X.X.XX.ebuild \
+# digest clean package
+src_test() {
+	# Bug #213475 - MySQL _will_ object strenously if your machine is named
+	# localhost. Also causes weird failures.
+	[[ "${HOSTNAME}" =3D=3D "localhost" ]] && die "Your machine must NOT be=
 named localhost"
+
+	emake check || die "make check failed"
+	if ! use "minimal" ; then
+		if [[ $UID -eq 0 ]]; then
+			die "Testing with FEATURES=3D-userpriv is no longer supported by upst=
ream. Tests MUST be run as non-root."
+		fi
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=
=3Dusersandbox"
+		cd "${S}"
+		einfo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+		local retstatus_unit
+		local retstatus_ns
+		local retstatus_ps
+		local t
+		addpredict /this-dir-does-not-exist/t9.MYI
+
+		# Ensure that parallel runs don't die
+		export MTR_BUILD_THREAD=3D"$((${RANDOM} % 100))"
+
+		# The entire 5.0 series has pre-generated SSL certificates, they have
+		# mostly expired now. ${S}/mysql-tests/std-data/*.pem
+		# The certs really SHOULD be generated for the tests, so that they are
+		# not expiring like this. We cannot do so ourselves as the tests look
+		# closely as the cert path data, and we do not have the CA key to rege=
n
+		# ourselves. Alternatively, upstream should generate them with at leas=
t
+		# 50-year validity.
+		#
+		# Known expiry points:
+		# 4.1.*, 5.0.0-5.0.22, 5.1.7: Expires 2013/09/09
+		# 5.0.23-5.0.77, 5.1.7-5.1.22?: Expires 2009/01/27
+		# 5.0.78-5.0.90, 5.1.??-5.1.42: Expires 2010/01/28
+		#
+		# mysql-test/std_data/untrusted-cacert.pem is MEANT to be
+		# expired/invalid.
+		case ${PV} in
+			5.1.*|5.5.*)
+				for t in openssl_1 rpl_openssl rpl.rpl_ssl rpl.rpl_ssl1 ssl ssl_8k_k=
ey \
+					ssl_compress ssl_connect rpl.rpl_heartbeat_ssl ; do \
+					mysql-v2_disable_test \
+						"$t" \
+						"These OpenSSL tests break due to expired certificates"
+				done
+			;;
+		esac
+
+		# These are also failing in MySQL 5.1 for now, and are believed to be
+		# false positives:
+		#
+		# main.mysql_comment, main.mysql_upgrade, main.information_schema,
+		# funcs_1.is_columns_mysql funcs_1.is_tables_mysql funcs_1.is_triggers=
:
+		# fails due to USE=3D-latin1 / utf8 default
+		#
+		# main.mysql_client_test:
+		# segfaults at random under Portage only, suspect resource limits.
+		#
+		# main.not_partition:
+		# Failure reason unknown at this time, must resolve before package.mas=
k
+		# removal FIXME
+		case ${PV} in
+			5.1.*|5.2.*|5.3.*|5.5.*)
+			for t in main.mysql_client_test main.mysql_comments \
+				main.mysql_upgrade  \
+				main.information_schema \
+				main.not_partition funcs_1.is_columns_mysql \
+				funcs_1.is_tables_mysql funcs_1.is_triggers; do
+				mysql-v2_disable_test  "$t" "False positives in Gentoo"
+			done
+			;;
+		esac
+
+		# New failures in 5.1.50/5.1.51, reported by jmbsvicetto.
+		# These tests are picking up a 'connect-timeout' config from somewhere=
,
+		# which is not valid, and since it does not have 'loose-' in front of
+		# it, it's causing a failure
+		case ${PV} in
+			5.1.5*|5.5.*|6*)
+			for t in rpl.rpl_mysql_upgrade main.log_tables_upgrade ; do
+				mysql-v2_disable_test  "$t" \
+					"False positives in Gentoo: connect-timeout"
+			done
+			;;
+		esac
+
+		use profiling && use community \
+		|| mysql-v2_disable_test main.profiling \
+			"Profiling test needs profiling support"
+
+		if [ "${PN}" =3D=3D "mariadb" ]; then
+			for t in \
+				parts.part_supported_sql_func_ndb \
+				parts.partition_auto_increment_ndb ; do
+					mysql-v2_disable_test $t "ndb not supported in mariadb"
+			done
+		fi
+
+		# create directories because mysqladmin might make out of order
+		mkdir -p "${S}"/mysql-test/var-{ps,ns}{,/log}
+
+		# We run the test protocols seperately
+		emake test-unit
+		retstatus_unit=3D$?
+		[[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed"
+
+		emake test-ns force=3D"--force --vardir=3D${S}/mysql-test/var-ns"
+		retstatus_ns=3D$?
+		[[ $retstatus_ns -eq 0 ]] || eerror "test-ns failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=
=3Dusersandbox"
+
+		emake test-ps force=3D"--force --vardir=3D${S}/mysql-test/var-ps"
+		retstatus_ps=3D$?
+		[[ $retstatus_ps -eq 0 ]] || eerror "test-ps failed"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=
=3Dusersandbox"
+
+		# TODO:
+		# When upstream enables the pr and nr testsuites, we need those as wel=
l.
+
+		# Cleanup is important for these testcases.
+		pkill -9 -f "${S}/ndb" 2>/dev/null
+		pkill -9 -f "${S}/sql" 2>/dev/null
+		failures=3D""
+		[[ $retstatus_unit -eq 0 ]] || failures=3D"${failures} test-unit"
+		[[ $retstatus_ns -eq 0 ]] || failures=3D"${failures} test-ns"
+		[[ $retstatus_ps -eq 0 ]] || failures=3D"${failures} test-ps"
+		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=
=3Dusersandbox"
+		[[ -z "$failures" ]] || die "Test failures: $failures"
+		einfo "Tests successfully completed"
+	else
+		einfo "Skipping server tests due to minimal build."
+	fi
+}