Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 561088
Collapse All | Expand All

(-)old/dev-db/percona-server/percona-server-5.6.26.74.0.ebuild (-2 / +1 lines)
Lines 127-134 multilib_src_test() { Link Here
127
		# run mysql-test tests
127
		# run mysql-test tests
128
		# We skip the innodb_stress suite because it depends on python2 being system python
128
		# We skip the innodb_stress suite because it depends on python2 being system python
129
		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
129
		perl mysql-test-run.pl --force --vardir="${T}/var-tests" \
130
			--testcase-timeout=30 --reorder \
130
			--testcase-timeout=30 --reorder
131
			--skip-test=innodb_stress
132
		retstatus_tests=$?
131
		retstatus_tests=$?
133
		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
132
		[[ $retstatus_tests -eq 0 ]] || eerror "tests failed"
134
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
133
		has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox"
(-)old/eclass/mysql-multilib.eclass (+14 lines)
Lines 30-35 MYSQL_EXTRAS="" Link Here
30
inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
30
inherit eutils flag-o-matic ${MYSQL_EXTRAS} mysql-cmake mysql_fx versionator \
31
	toolchain-funcs user cmake-utils multilib-minimal
31
	toolchain-funcs user cmake-utils multilib-minimal
32
32
33
if [[ ${PN} == "percona-server" ]] ; then
34
	# Required for test suite
35
	PYTHON_COMPAT=( python2_7 )
36
	inherit python-any-r1
37
fi
38
33
#
39
#
34
# Supported EAPI versions and export functions
40
# Supported EAPI versions and export functions
35
#
41
#
Lines 457-462 DEPEND="${DEPEND} Link Here
457
	>=dev-util/cmake-2.8.9
463
	>=dev-util/cmake-2.8.9
458
"
464
"
459
465
466
if [[ ${PN} == "percona-server" ]] ; then
467
	DEPEND="${DEPEND} test? ( $(python_gen_any_dep 'dev-python/mysql-python[${PYTHON_USEDEP}]') )"
468
fi
469
460
# Transition dep until all ebuilds have client-libs patch and USE
470
# Transition dep until all ebuilds have client-libs patch and USE
461
if ! [[ ${HAS_TOOLS_PATCH} ]] ; then
471
if ! [[ ${HAS_TOOLS_PATCH} ]] ; then
462
	DEPEND="${DEPEND} sys-libs/ncurses[${MULTILIB_USEDEP}]"
472
	DEPEND="${DEPEND} sys-libs/ncurses[${MULTILIB_USEDEP}]"
Lines 523-528 mysql-multilib_pkg_setup() { Link Here
523
			if ! has userpriv ${FEATURES} ; then
533
			if ! has userpriv ${FEATURES} ; then
524
				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
534
				eerror "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root."
525
			fi
535
			fi
536
537
			if [[ ${PN} == "percona-server" ]] ; then
538
				python-any-r1_pkg_setup
539
			fi
526
		fi
540
		fi
527
	fi
541
	fi
528
542

Return to bug 561088