diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-05-04 15:27:38 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-05-04 15:27:38 +0000 |
| commit | f8ccba00e5c1171e5dc97e277135729c59dbb19c (patch) | |
| tree | e425c5c3768400874dd5a7b520ff283b681cd5da /dev-cpp | |
| parent | amd64 stable wrt bug #501662 (diff) | |
| download | gentoo-2-f8ccba00e5c1171e5dc97e277135729c59dbb19c.tar.gz gentoo-2-f8ccba00e5c1171e5dc97e277135729c59dbb19c.tar.bz2 gentoo-2-f8ccba00e5c1171e5dc97e277135729c59dbb19c.zip | |
Force python-2.x when running tests #455276 by Markus Oehme.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Diffstat (limited to 'dev-cpp')
| -rw-r--r-- | dev-cpp/gmock/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-cpp/gmock/gmock-1.7.0-r1.ebuild | 18 |
2 files changed, 20 insertions, 3 deletions
diff --git a/dev-cpp/gmock/ChangeLog b/dev-cpp/gmock/ChangeLog index 34c28d6cfde2..3a0612050228 100644 --- a/dev-cpp/gmock/ChangeLog +++ b/dev-cpp/gmock/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-cpp/gmock # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.20 2014/03/27 02:35:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.21 2014/05/04 15:27:38 vapier Exp $ + + 04 May 2014; Mike Frysinger <vapier@gentoo.org> gmock-1.7.0-r1.ebuild: + Force python-2.x when running tests #455276 by Markus Oehme. *gmock-1.7.0-r1 (27 Mar 2014) diff --git a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild index f968d5f82b69..9a118336ae86 100644 --- a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild +++ b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild @@ -1,10 +1,12 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.1 2014/03/27 02:35:20 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.2 2014/05/04 15:27:38 vapier Exp $ EAPI="4" -inherit libtool multilib-minimal +PYTHON_COMPAT=( python2_7 ) + +inherit libtool multilib-minimal python-any-r1 DESCRIPTION="Google's C++ mocking framework" HOMEPAGE="http://code.google.com/p/googlemock/" @@ -17,8 +19,15 @@ IUSE="static-libs" RDEPEND="=dev-cpp/gtest-${PV}*[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} + test? ( ${PYTHON_DEPS} ) app-arch/unzip" +pkg_setup() { + # Stub to disable python_setup running when USE=-test. + # We'll handle it down in src_test ourselves. + : +} + src_unpack() { default # make sure we always use the system one @@ -36,6 +45,11 @@ multilib_src_configure() { ECONF_SOURCE=${S} econf $(use_enable static-libs static) } +multilib_src_test() { + python_setup + emake check +} + multilib_src_install() { default dobin scripts/gmock-config |