summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2013-09-02 18:38:26 +0000
committerMike Gilbert <floppym@gentoo.org>2013-09-02 18:38:26 +0000
commit79b15bfa6e71096804cadc52f3a0b4e0871c0b96 (patch)
treebf687e7e66f5690b2a454b49894a55ac0f4ab528 /dev-python/bitstring
parentFix segfaults in vlc and other applications that try to unload libgobject at ... (diff)
downloadgentoo-2-79b15bfa6e71096804cadc52f3a0b4e0871c0b96.tar.gz
gentoo-2-79b15bfa6e71096804cadc52f3a0b4e0871c0b96.tar.bz2
gentoo-2-79b15bfa6e71096804cadc52f3a0b4e0871c0b96.zip
Fix tests under python2.6. Add python3.3.
(Portage version: 2.2.1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'dev-python/bitstring')
-rw-r--r--dev-python/bitstring/ChangeLog5
-rw-r--r--dev-python/bitstring/bitstring-3.1.1.ebuild25
2 files changed, 17 insertions, 13 deletions
diff --git a/dev-python/bitstring/ChangeLog b/dev-python/bitstring/ChangeLog
index 0a55ab2f352f..73466a1c10da 100644
--- a/dev-python/bitstring/ChangeLog
+++ b/dev-python/bitstring/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-python/bitstring
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/ChangeLog,v 1.12 2013/05/10 03:44:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/ChangeLog,v 1.13 2013/09/02 18:38:26 floppym Exp $
+
+ 02 Sep 2013; Mike Gilbert <floppym@gentoo.org> bitstring-3.1.1.ebuild:
+ Fix tests under python2.6. Add python3.3.
10 May 2013; Patrick Lauer <patrick@gentoo.org> bitstring-3.1.0.ebuild,
bitstring-3.1.1.ebuild:
diff --git a/dev-python/bitstring/bitstring-3.1.1.ebuild b/dev-python/bitstring/bitstring-3.1.1.ebuild
index 7873c33d8423..ac2c0fe47e2a 100644
--- a/dev-python/bitstring/bitstring-3.1.1.ebuild
+++ b/dev-python/bitstring/bitstring-3.1.1.ebuild
@@ -1,9 +1,9 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.1.ebuild,v 1.3 2013/05/10 03:44:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bitstring/bitstring-3.1.1.ebuild,v 1.4 2013/09/02 18:38:26 floppym Exp $
EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2} )
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
inherit distutils-r1
DESCRIPTION="A pure Python module for creation and analysis of binary data"
@@ -13,17 +13,18 @@ SRC_URI="http://python-bitstring.googlecode.com/files/${P}.zip"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="app-arch/unzip"
+IUSE="test"
+DEPEND="app-arch/unzip
+ test? ( virtual/python-unittest2[${PYTHON_USEDEP}] )"
RDEPEND=""
python_test() {
- pushd test > /dev/null
- PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitarray || die "test_bitarray failed"
- PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bits || die "test_bits failed"
- PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitstore || die "test_bitstore failed"
- PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitstream || die "test_bitstream failed"
- PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_bitstring || die "test_bitstring failed"
- PYTHONPATH="${BUILD_DIR}"/lib "${PYTHON}" -m unittest test_constbitstream || die "test_constbitstream failed"
- popd > /dev/null
+ if [[ ${EPYTHON} == python2.6 ]]; then
+ local runner=( unit2.py )
+ else
+ local runner=( "${PYTHON}" -m unittest )
+ fi
+ pushd test > /dev/null || die
+ "${runner[@]}" discover || die "Testing failed with ${EPYTHON}"
+ popd test > /dev/null || die
}