| 1 |
arfrever 10/09/28 22:16:43 |
| 2 |
|
| 3 |
Modified: ChangeLog pyopenssl-0.10-r1.ebuild |
| 4 |
Log: |
| 5 |
Disable failing tests instead of all tests. Don't install tests. |
| 6 |
|
| 7 |
(Portage version: 2.2_rc88_p32/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.62 dev-python/pyopenssl/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopenssl/ChangeLog?rev=1.62&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopenssl/ChangeLog?rev=1.62&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopenssl/ChangeLog?r1=1.61&r2=1.62 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v |
| 19 |
retrieving revision 1.61 |
| 20 |
retrieving revision 1.62 |
| 21 |
diff -u -r1.61 -r1.62 |
| 22 |
--- ChangeLog 28 Sep 2010 08:57:45 -0000 1.61 |
| 23 |
+++ ChangeLog 28 Sep 2010 22:16:43 -0000 1.62 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for dev-python/pyopenssl |
| 26 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.61 2010/09/28 08:57:45 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.62 2010/09/28 22:16:43 arfrever Exp $ |
| 29 |
+ |
| 30 |
+ 28 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 31 |
+ pyopenssl-0.10-r1.ebuild: |
| 32 |
+ Disable failing tests instead of all tests. Don't install tests. |
| 33 |
|
| 34 |
28 Sep 2010; Samuli Suominen <ssuominen@g.o> |
| 35 |
pyopenssl-0.10-r1.ebuild: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.11 dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild?rev=1.11&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild?rev=1.11&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild?r1=1.10&r2=1.11 |
| 44 |
|
| 45 |
Index: pyopenssl-0.10-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild,v |
| 48 |
retrieving revision 1.10 |
| 49 |
retrieving revision 1.11 |
| 50 |
diff -u -r1.10 -r1.11 |
| 51 |
--- pyopenssl-0.10-r1.ebuild 28 Sep 2010 08:57:45 -0000 1.10 |
| 52 |
+++ pyopenssl-0.10-r1.ebuild 28 Sep 2010 22:16:43 -0000 1.11 |
| 53 |
@@ -1,6 +1,6 @@ |
| 54 |
# Copyright 1999-2010 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild,v 1.10 2010/09/28 08:57:45 ssuominen Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild,v 1.11 2010/09/28 22:16:43 arfrever Exp $ |
| 58 |
|
| 59 |
EAPI="3" |
| 60 |
PYTHON_DEPEND="2" |
| 61 |
@@ -26,8 +26,6 @@ |
| 62 |
DEPEND="${RDEPEND} |
| 63 |
doc? ( >=dev-tex/latex2html-2002.2 )" |
| 64 |
|
| 65 |
-RESTRICT="test" # Syntax changed in OpenSSL 1.x, see #326637 |
| 66 |
- |
| 67 |
S="${WORKDIR}/${MY_P}" |
| 68 |
|
| 69 |
PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") |
| 70 |
@@ -37,6 +35,18 @@ |
| 71 |
src_prepare() { |
| 72 |
distutils_src_prepare |
| 73 |
epatch "${FILESDIR}/${P}-openssl-1.patch" |
| 74 |
+ |
| 75 |
+ # Disable tests failing with OpenSSL >=1.0.0. |
| 76 |
+ sed \ |
| 77 |
+ -e "s/test_dump_privatekey/_&/" \ |
| 78 |
+ -e "s/test_export_without_args/_&/" \ |
| 79 |
+ -e "s/test_export_without_mac/_&/" \ |
| 80 |
+ -e "s/test_friendly_name/_&/" \ |
| 81 |
+ -e "s/test_load_pkcs12/_&/" \ |
| 82 |
+ -e "s/test_various_empty_passphrases/_&/" \ |
| 83 |
+ -e "s/test_zero_len_list_for_ca/_&/" \ |
| 84 |
+ -i test/test_crypto.py |
| 85 |
+ sed -e "s/test_load_verify_directory/_&/" -i test/test_ssl.py |
| 86 |
} |
| 87 |
|
| 88 |
src_compile() { |
| 89 |
@@ -57,12 +67,19 @@ |
| 90 |
src_test() { |
| 91 |
test_package() { |
| 92 |
pushd test > /dev/null |
| 93 |
- local test |
| 94 |
+ |
| 95 |
+ local return_status="0" test |
| 96 |
for test in test_*.py; do |
| 97 |
- echo -e "\e[1;31mRunning ${test}...\e[0m" |
| 98 |
- PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}" || die "${test} failed with Python ${PYTHON_ABI}" |
| 99 |
+ einfo "Running ${test}..." |
| 100 |
+ if ! PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}"; then |
| 101 |
+ eerror "${test} failed with $(python_get_implementation) $(python_get_version)" |
| 102 |
+ return_status="1" |
| 103 |
+ fi |
| 104 |
done |
| 105 |
+ |
| 106 |
popd > /dev/null |
| 107 |
+ |
| 108 |
+ return "${return_status}" |
| 109 |
} |
| 110 |
python_execute_function test_package |
| 111 |
} |
| 112 |
@@ -70,6 +87,11 @@ |
| 113 |
src_install() { |
| 114 |
distutils_src_install |
| 115 |
|
| 116 |
+ delete_tests() { |
| 117 |
+ rm -fr "${ED}$(python_get_sitedir)/OpenSSL/test" |
| 118 |
+ } |
| 119 |
+ python_execute_function -q delete_tests |
| 120 |
+ |
| 121 |
if use doc; then |
| 122 |
dohtml doc/html/* |
| 123 |
dodoc doc/pyOpenSSL.* |
Archives