diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-03-07 04:13:27 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-03-07 04:13:27 +0000 |
| commit | c6ba18201832fbec9f65c359efd60c4ee18ad711 (patch) | |
| tree | 5ab59203a57a993ad4cb740bb8d9592ff7804ca3 /eclass/python.eclass | |
| parent | add ~x64-macos, bug 395011 (diff) | |
| download | gentoo-2-c6ba18201832fbec9f65c359efd60c4ee18ad711.tar.gz gentoo-2-c6ba18201832fbec9f65c359efd60c4ee18ad711.tar.bz2 gentoo-2-c6ba18201832fbec9f65c359efd60c4ee18ad711.zip | |
Fix default src_test implementation in EAPI 4. Patch by pesa.
Diffstat (limited to 'eclass/python.eclass')
| -rw-r--r-- | eclass/python.eclass | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/eclass/python.eclass b/eclass/python.eclass index ccc914f27c85..7805a1177caa 100644 --- a/eclass/python.eclass +++ b/eclass/python.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.151 2012/02/27 03:57:35 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/python.eclass,v 1.152 2012/03/07 04:13:27 floppym Exp $ # @ECLASS: python.eclass # @MAINTAINER: @@ -1021,10 +1021,12 @@ python_execute_function() { } elif [[ "${EBUILD_PHASE}" == "test" ]]; then python_default_function() { - if emake -j1 -n check &> /dev/null; then - emake -j1 check "$@" - elif emake -j1 -n test &> /dev/null; then - emake -j1 test "$@" + # Stolen from portage's _eapi0_src_test() + local emake_cmd="${MAKE:-make} ${MAKEOPTS} ${EXTRA_EMAKE}" + if ${emake_cmd} -j1 -n check &> /dev/null; then + ${emake_cmd} -j1 check "$@" + elif ${emake_cmd} -j1 -n test &> /dev/null; then + ${emake_cmd} -j1 test "$@" fi } elif [[ "${EBUILD_PHASE}" == "install" ]]; then |