diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-09-28 22:16:43 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2010-09-28 22:16:43 +0000 |
| commit | 8a5bdc14b46f1d958858f7dd6a7dc7e2c2f51173 (patch) | |
| tree | 9290875e4fd0cfdda4ab9776ad3ab9450b5d9831 /dev-python/pyopenssl | |
| parent | Version bump. API doc update. (diff) | |
| download | historical-8a5bdc14b46f1d958858f7dd6a7dc7e2c2f51173.tar.gz historical-8a5bdc14b46f1d958858f7dd6a7dc7e2c2f51173.tar.bz2 historical-8a5bdc14b46f1d958858f7dd6a7dc7e2c2f51173.zip | |
Disable failing tests instead of all tests. Don't install tests.
Package-Manager: portage-2.2_rc88_p32/cvs/Linux x86_64
Diffstat (limited to 'dev-python/pyopenssl')
| -rw-r--r-- | dev-python/pyopenssl/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-python/pyopenssl/Manifest | 4 | ||||
| -rw-r--r-- | dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild | 34 |
3 files changed, 35 insertions, 9 deletions
diff --git a/dev-python/pyopenssl/ChangeLog b/dev-python/pyopenssl/ChangeLog index 7f0e4adc02e5..489f9f377080 100644 --- a/dev-python/pyopenssl/ChangeLog +++ b/dev-python/pyopenssl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-python/pyopenssl # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.61 2010/09/28 08:57:45 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/ChangeLog,v 1.62 2010/09/28 22:16:43 arfrever Exp $ + + 28 Sep 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + pyopenssl-0.10-r1.ebuild: + Disable failing tests instead of all tests. Don't install tests. 28 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> pyopenssl-0.10-r1.ebuild: diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest index deb57a89bf15..a7093abce7b4 100644 --- a/dev-python/pyopenssl/Manifest +++ b/dev-python/pyopenssl/Manifest @@ -1,5 +1,5 @@ AUX pyopenssl-0.10-openssl-1.patch 337 RMD160 b5bf588c64f58a31594c2077d90d9d3828212dab SHA1 7c5ed0d32ca93b18b1a20eca0d49d1432c95b8e2 SHA256 8f608442f669fed20aac98d86a1f97725ea42004c77e6655fd130a38a34af661 DIST pyOpenSSL-0.10.tar.gz 222169 RMD160 1e303655754b5652327151a790ac6f3b25959972 SHA1 11c956d317ab2b1628937a2681acc31f4b890fe8 SHA256 4514f8960389042ca2587f9cb801a13f7990387753fc678680b0c084719b5b60 -EBUILD pyopenssl-0.10-r1.ebuild 2050 RMD160 70e3fc7e66e03f6ef661cb343675a1c19b67ea88 SHA1 348be2ae04833995294ed85c2d6abe057222518a SHA256 a0f551a4ecea5e9776fe72080b400e094e68bba3faa1ffc9b8f2844441d00601 -MISC ChangeLog 8449 RMD160 8a4552bc3f1a05a49162293e110600836f711f0d SHA1 7d704203c47a265fd904a4a8ee4dd3fc3e97980e SHA256 0eb844a69712bf7dd892764f88dc17d6fe2147d044c1f292f57c5f325a621f00 +EBUILD pyopenssl-0.10-r1.ebuild 2619 RMD160 44dd3f4fd96025bd831f042dc83a9f49c9d183f2 SHA1 5b8b8744a1cf762dadb3ed108b6e4c763ac4ea7b SHA256 837204fd9e3187fb9a624b74e5cce061ef36b192467379e67d7a7384144527fd +MISC ChangeLog 8617 RMD160 2dd6948c18bc50201b453697953c98b1308e0be9 SHA1 0843f3f487e3d2c68bb3e3871e9ef8e457730894 SHA256 33759368dc5687caf1e435be1346324f8027767e65412ae69db98a499659c92b MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 diff --git a/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild index fafd91282389..517e60eac5d1 100644 --- a/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild +++ b/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild,v 1.10 2010/09/28 08:57:45 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyopenssl/pyopenssl-0.10-r1.ebuild,v 1.11 2010/09/28 22:16:43 arfrever Exp $ EAPI="3" PYTHON_DEPEND="2" @@ -26,8 +26,6 @@ RDEPEND=">=dev-libs/openssl-0.9.6g" DEPEND="${RDEPEND} doc? ( >=dev-tex/latex2html-2002.2 )" -RESTRICT="test" # Syntax changed in OpenSSL 1.x, see #326637 - S="${WORKDIR}/${MY_P}" PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") @@ -37,6 +35,18 @@ PYTHON_MODNAME="OpenSSL" src_prepare() { distutils_src_prepare epatch "${FILESDIR}/${P}-openssl-1.patch" + + # Disable tests failing with OpenSSL >=1.0.0. + sed \ + -e "s/test_dump_privatekey/_&/" \ + -e "s/test_export_without_args/_&/" \ + -e "s/test_export_without_mac/_&/" \ + -e "s/test_friendly_name/_&/" \ + -e "s/test_load_pkcs12/_&/" \ + -e "s/test_various_empty_passphrases/_&/" \ + -e "s/test_zero_len_list_for_ca/_&/" \ + -i test/test_crypto.py + sed -e "s/test_load_verify_directory/_&/" -i test/test_ssl.py } src_compile() { @@ -57,12 +67,19 @@ src_compile() { src_test() { test_package() { pushd test > /dev/null - local test + + local return_status="0" test for test in test_*.py; do - echo -e "\e[1;31mRunning ${test}...\e[0m" - PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}" || die "${test} failed with Python ${PYTHON_ABI}" + einfo "Running ${test}..." + if ! PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}"; then + eerror "${test} failed with $(python_get_implementation) $(python_get_version)" + return_status="1" + fi done + popd > /dev/null + + return "${return_status}" } python_execute_function test_package } @@ -70,6 +87,11 @@ src_test() { src_install() { distutils_src_install + delete_tests() { + rm -fr "${ED}$(python_get_sitedir)/OpenSSL/test" + } + python_execute_function -q delete_tests + if use doc; then dohtml doc/html/* dodoc doc/pyOpenSSL.* |