add missing (pypy support and test phase) and matching patch

(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D)

3 files changed, 38 insertions, 3 deletions

diff --git a/dev-python/subunit/ChangeLog b/dev-python/subunit/ChangeLog
index e42d5c1f09b1..5307175b3f91 100644
--- a/dev-python/subunit/ChangeLog
+++ b/dev-python/subunit/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/subunit
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/ChangeLog,v 1.25 2013/04/19 17:43:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/ChangeLog,v 1.26 2013/06/17 11:28:59 idella4 Exp $
+
+  17 Jun 2013; Ian Delaney <idella4@gentoo.org> +files/shell-tests.patch,
+  subunit-0.0.10-r1.ebuild:
+  add missing (pypy support and test phase) and matching patch
 
   19 Apr 2013; Michał Górny <mgorny@gentoo.org> subunit-0.0.10-r1.ebuild:
   Switch to python-single-r1 since Python is only used internally by the
diff --git a/dev-python/subunit/files/shell-tests.patch b/dev-python/subunit/files/shell-tests.patch
new file mode 100644
index 000000000000..46d72c168fc8
--- /dev/null
+++ b/dev-python/subunit/files/shell-tests.patch
@@ -0,0 +1,24 @@
+diff -ur subunit-0.0.10.orig/shell/tests/test_function_output.sh subunit-0.0.10/shell/tests/test_function_output.sh
+--- shell/tests/test_function_output.sh	2013-06-17 19:02:34.378260908 +0800
++++ tests/test_function_output.sh	2013-06-17 19:03:49.082260928 +0800
+@@ -22,7 +22,7 @@
+ # it is assumed that we are running from the 'shell' tree root in the source
+ # of subunit, and that the library sourcing tests have all passed - if they 
+ # have not, this test script may well fail strangely.
+-
++SHELL_SHARE="shell/share/"
+ # import the library.
+ . ${SHELL_SHARE}subunit.sh
+ 
+diff -ur subunit-0.0.10.orig/shell/tests/test_source_library.sh subunit-0.0.10/shell/tests/test_source_library.sh
+--- shell/tests/test_source_library.sh	2013-06-17 19:03:01.322260915 +0800
++++ shell/tests/test_source_library.sh	2013-06-17 18:53:46.634260762 +0800
+@@ -20,7 +20,7 @@
+ # bindings being complete yet.
+ 
+ # we expect to be run from the tree root.
+-
++SHELL_SHARE="shell/share/"
+ echo 'test: shell bindings can be sourced'
+ # if any output occurs, this has failed to source cleanly
+ source_output=$(. ${SHELL_SHARE}subunit.sh 2>&1)
diff --git a/dev-python/subunit/subunit-0.0.10-r1.ebuild b/dev-python/subunit/subunit-0.0.10-r1.ebuild
index 237a9b83cc29..9762e4799eb6 100644
--- a/dev-python/subunit/subunit-0.0.10-r1.ebuild
+++ b/dev-python/subunit/subunit-0.0.10-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-0.0.10-r1.ebuild,v 1.2 2013/04/19 17:43:06 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/subunit/subunit-0.0.10-r1.ebuild,v 1.3 2013/06/17 11:28:59 idella4 Exp $
 
 EAPI=5
 
-PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
+PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 )
 
 inherit autotools-utils python-single-r1
 
@@ -29,10 +29,17 @@ src_prepare() {
 	# update py-compile to handle py3 properly
 	# XXX: handle it in the eclass?
 	cp "$(automake --print-libdir || die)"/py-compile . || die
+	epatch "${FILESDIR}"/shell-tests.patch
 
 	autotools-utils_src_prepare
 }
 
+src_test() {
+	if ! PYTHONPATH="${S}"/python/ "${PYTHON}" runtests.py; then
+		die "Tests failed under ${EPYTHON}"
+	fi
+}
+
 src_install() {
 	autotools-utils_src_install