diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-08-24 20:46:24 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-08-24 20:46:24 +0000 |
| commit | 417064719cf3cb75f22139ae796986800ff1bbdf (patch) | |
| tree | 37eb3dcbf62b50f9f21e863b7a55d8c806f35d87 /dev-python/docutils | |
| parent | 0.8.66 version bump. (diff) | |
| download | gentoo-2-417064719cf3cb75f22139ae796986800ff1bbdf.tar.gz gentoo-2-417064719cf3cb75f22139ae796986800ff1bbdf.tar.bz2 gentoo-2-417064719cf3cb75f22139ae796986800ff1bbdf.zip | |
Fix tests when run with python 3. Bug 432546.
(Portage version: 2.2.0_alpha122/cvs/Linux x86_64)
Diffstat (limited to 'dev-python/docutils')
| -rw-r--r-- | dev-python/docutils/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-python/docutils/docutils-0.9.1.ebuild | 12 |
2 files changed, 13 insertions, 4 deletions
diff --git a/dev-python/docutils/ChangeLog b/dev-python/docutils/ChangeLog index 2ec84ca79e30..b974c187e80b 100644 --- a/dev-python/docutils/ChangeLog +++ b/dev-python/docutils/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-python/docutils # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.156 2012/08/24 18:35:06 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/ChangeLog,v 1.157 2012/08/24 20:46:24 floppym Exp $ + + 24 Aug 2012; Mike Gilbert <floppym@gentoo.org> docutils-0.9.1.ebuild: + Fix tests when run with python 3. Bug 432546. 24 Aug 2012; Mike Gilbert <floppym@gentoo.org> docutils-0.9.1.ebuild: Call die if pkg_preinst is not removed on the next bump. diff --git a/dev-python/docutils/docutils-0.9.1.ebuild b/dev-python/docutils/docutils-0.9.1.ebuild index 6eebdb6114f0..338d6d393917 100644 --- a/dev-python/docutils/docutils-0.9.1.ebuild +++ b/dev-python/docutils/docutils-0.9.1.ebuild @@ -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/dev-python/docutils/docutils-0.9.1.ebuild,v 1.3 2012/08/24 18:35:06 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/docutils/docutils-0.9.1.ebuild,v 1.4 2012/08/24 20:46:24 floppym Exp $ EAPI="4" SUPPORT_PYTHON_ABIS="1" @@ -46,8 +46,14 @@ src_compile() { src_test() { testing() { - echo PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $([[ -f build-${PYTHON_ABI}/lib/test/alltests.py ]] && echo build-${PYTHON_ABI}/lib/test/alltests.py || echo test/alltests.py) - PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" $([[ -f build-${PYTHON_ABI}/lib/test/alltests.py ]] && echo build-${PYTHON_ABI}/lib/test/alltests.py || echo test/alltests.py) + local testfile + if [[ $(python_get_version --language --major) == 3 ]]; then + testfile=test3/alltests.py + else + testfile=test/alltests.py + fi + echo PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" "${testfile}" + PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" "${testfile}" } python_execute_function testing } |