[patch] DEPEND on Python2_7 for dev-db/percona-server when FEATURES=tests is set

add-python-for-test-suite.patch (text/plain), 2.03 KB, created by Thomas Deutschmann (RETIRED) on 2015-09-21 22:06:14 UTC

diff -rupN old/dev-db/percona-server/percona-server-5.6.26.74.0.ebuild new/dev-db/percona-server/percona-server-5.6.26.74.0.ebuild
--- old/dev-db/percona-server/percona-server-5.6.26.74.0.ebuild	2015-09-21 19:01:02.000000000 +0200
+++ new/dev-db/percona-server/percona-server-5.6.26.74.0.ebuild	2015-09-21 23:58:11.659183591 +0200
@@ -127,8 +127,7 @@ multilib_src_test() {
 		# run mysql-test tests
 		# We skip the innodb_stress suite because it depends on python2 being system python
 		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
-			--testcase-timeout=30 --reorder \
-			--skip-test=innodb_stress
+			--testcase-timeout=30 --reorder
 		retstatus_tests=$?
 		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
 		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
diff -rupN old/eclass/mysql-multilib.eclass new/eclass/mysql-multilib.eclass
--- old/eclass/mysql-multilib.eclass	2015-09-21 23:56:31.381949808 +0200
+++ new/eclass/mysql-multilib.eclass	2015-09-21 23:57:29.883252985 +0200
@@ -30,6 +30,12 @@ MYSQL_EXTRAS=""
 inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
 	toolchain-funcs user cmake-utils multilib-minimal
 
+if [[ ${PN} == "percona-server" ]] ; then
+	# Required for test suite
+	PYTHON_COMPAT=( python2_7 )
+	inherit python-any-r1
+fi
+
 #
 # Supported EAPI versions and export functions
 #
@@ -457,6 +463,10 @@ DEPEND="${DEPEND}
 	>=dev-util/cmake-2.8.9
 "
 
+if [[ ${PN} == "percona-server" ]] ; then
+	DEPEND="${DEPEND} test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
+fi
+
 # Transition dep until all ebuilds have client-libs patch and USE
 if ! [[ ${HAS_TOOLS_PATCH} ]] ; then
 	DEPEND="${DEPEND} sys-libs/ncurses[${MULTILIB_USEDEP}]"
@@ -523,6 +533,10 @@ mysql-multilib_pkg_setup() {
 			if ! has userpriv ${FEATURES} ; then
 				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
 			fi
+
+			if [[ ${PN} == "percona-server" ]] ; then
+				python-any-r1_pkg_setup
+			fi
 		fi
 	fi