From b15d1e2b458d92a72d66ac20fd5d0f9c7c30a1bb19c4fd08f6704bdc3a0ba417 Mon Sep 17 00:00:00 2001 From: Jan Matejek Date: Mon, 17 Mar 2014 17:14:24 +0000 Subject: [PATCH] Accepting request 226488 from home:Andreas_Schwab:Factory - Use profile-opt only when profiling is enabled - python-2.7.2-disable-tests-in-test_io.patch: removed, no longer needed - update testsuite exclusion list: * test_signal and test_posix fail due to qemu bugs OBS-URL: https://build.opensuse.org/request/show/226488 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:Factory/python?expand=0&rev=164 --- python-2.7.2-disable-tests-in-test_io.patch | 10 ------ python-base.changes | 8 +++++ python-base.spec | 36 ++++++++++++--------- python-doc.spec | 5 --- python.spec | 5 --- 5 files changed, 29 insertions(+), 35 deletions(-) delete mode 100644 python-2.7.2-disable-tests-in-test_io.patch diff --git a/python-2.7.2-disable-tests-in-test_io.patch b/python-2.7.2-disable-tests-in-test_io.patch deleted file mode 100644 index 7dde5f4..0000000 --- a/python-2.7.2-disable-tests-in-test_io.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Lib/test/test_io.py -+++ b/Lib/test/test_io.py -@@ -2970,6 +2970,7 @@ - self.check_interrupted_read_retry(lambda x: x, - mode="r") - -+ @unittest.skip('rhbz#732998') - @unittest.skipUnless(threading, 'Threading required for this test.') - def check_interrupted_write_retry(self, item, **fdopen_kwargs): - """Check that a buffered write, when it gets interrupted (either diff --git a/python-base.changes b/python-base.changes index 2cac4bb..1d02c55 100644 --- a/python-base.changes +++ b/python-base.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Mar 15 08:05:41 UTC 2014 - schwab@suse.de + +- Use profile-opt only when profiling is enabled +- python-2.7.2-disable-tests-in-test_io.patch: removed, no longer needed +- update testsuite exclusion list: + * test_signal and test_posix fail due to qemu bugs + ------------------------------------------------------------------- Fri Mar 14 20:26:03 UTC 2014 - andreas.stieger@gmx.de diff --git a/python-base.spec b/python-base.spec index 494ab5d..66f1a17 100644 --- a/python-base.spec +++ b/python-base.spec @@ -40,7 +40,6 @@ Patch7: python-2.6-gettext-plurals.patch Patch8: python-2.6b3-curses-panel.patch Patch10: sparc_longdouble.patch Patch13: python-2.7.2-fix_date_time_compiler.patch -Patch15: python-2.7.2-disable-tests-in-test_io.patch Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch @@ -146,10 +145,6 @@ other applications. %patch8 -p1 %patch10 -p1 %patch13 -p1 -#skip test_io test for ppc,ppc64 as it is broken. -%ifarch ppc ppc64 ppc64le -%patch15 -p1 -%endif %patch17 -p1 %patch18 -p1 %patch20 -p1 @@ -188,8 +183,13 @@ touch Parser/asdl* Python/Python-ast.c Include/Python-ast.h --enable-shared \ --enable-unicode=ucs4 +%if 0%{?do_profiling} +target=profile-opt +%else +target=all +%endif LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ - make %{?_smp_mflags} profile-opt + make %{?_smp_mflags} $target %check # on hppa, the threading of glibc is quite broken. The tests just stop @@ -198,34 +198,40 @@ LD_LIBRARY_PATH=.:$LD_LIBRARY_PATH \ %ifnarch hppa # test_file(2k) fails in autobuild env - "stdin.seek(-1)" wrongly succeeds. probably an issue with autobuild's stdin # test_urllib2 relies on being able to resolve local address, which is notoriously impossible in autobuild -EXCLUDE="-x test_urllib2 -x test_file -x test_file2k" +EXCLUDE="test_urllib2 test_file test_file2k" # test_nis and test_threading are AWFULLY slow. -EXCLUDE="$EXCLUDE -x test_nis -x test_threading" +EXCLUDE="$EXCLUDE test_nis test_threading" # test_gdb fails if gdb with (different) python support is part of the buildsystem -EXCLUDE="$EXCLUDE -x test_gdb" +EXCLUDE="$EXCLUDE test_gdb" %ifarch ia64 # test_smtplib's testSend is known to be broken and on ia64 it actually fails most of the time, preventing the build. -EXCLUDE="$EXCLUDE -x test_smtplib" +EXCLUDE="$EXCLUDE test_smtplib" %endif # test_unicode fails in Factory -EXCLUDE="$EXCLUDE -x test_unicode" +EXCLUDE="$EXCLUDE test_unicode" %if 0%{?qemu_user_space_build} # test_asyncore fails because of unimplemented sockopt -EXCLUDE="$EXCLUDE -x test_asyncore -x test_mmap" +EXCLUDE="$EXCLUDE test_asyncore test_mmap" # emulation is unreliable -EXCLUDE="$EXCLUDE -x test_multiprocessing" +EXCLUDE="$EXCLUDE test_multiprocessing" +# qemu bug (siginterrupt handling) +EXCLUDE="$EXCLUDE test_signal" +%endif +%ifarch aarch64 +# qemu bug (wrong USE_UID16) +EXCLUDE="$EXCLUDE test_posix" %endif # This test (part of test_uuid) requires real network interfaces # so that ifconfig output has "HWaddr ". Some kvm instances # don't have any such interface breaking the uuid module test. -EXCLUDE="$EXCLUDE -x test_uuid" +EXCLUDE="$EXCLUDE test_uuid" # Limit virtual memory to avoid spurious failures if test $(ulimit -v) = unlimited || test $(ulimit -v) -gt 10000000; then ulimit -v 10000000 || : fi -make test TESTOPTS="-l $EXCLUDE" TESTPYTHONOPTS="-R" +make test TESTOPTS="-l -x $EXCLUDE" TESTPYTHONOPTS="-R" # use network, be verbose: #make test TESTOPTS="-l -u network -v" %endif diff --git a/python-doc.spec b/python-doc.spec index fe0bd86..70a7deb 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -45,7 +45,6 @@ Patch7: python-2.6-gettext-plurals.patch Patch8: python-2.6b3-curses-panel.patch Patch10: sparc_longdouble.patch Patch13: python-2.7.2-fix_date_time_compiler.patch -Patch15: python-2.7.2-disable-tests-in-test_io.patch Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch @@ -105,10 +104,6 @@ Python, and Macintosh Module Reference in PDF format. %patch8 -p1 %patch10 -p1 %patch13 -p1 -#skip test_io test for ppc,ppc64 as it is broken. -%ifarch ppc ppc64 ppc64le -%patch15 -p1 -%endif %patch17 -p1 %patch18 -p1 %patch20 -p1 diff --git a/python.spec b/python.spec index 6414d9f..39ddef6 100644 --- a/python.spec +++ b/python.spec @@ -46,7 +46,6 @@ Patch7: python-2.6-gettext-plurals.patch Patch8: python-2.6b3-curses-panel.patch Patch10: sparc_longdouble.patch Patch13: python-2.7.2-fix_date_time_compiler.patch -Patch15: python-2.7.2-disable-tests-in-test_io.patch Patch17: remove-static-libpython.diff # PATCH-FIX-OPENSUSE python-2.7.3-ssl_ca_path.patch [bnc#761501] -- Support directory-based certificate stores with the ca_certs parameter of SSL functions Patch18: python-2.7.3-ssl_ca_path.patch @@ -182,10 +181,6 @@ implementation of the standard Unix DBM databases. %patch8 -p1 %patch10 -p1 %patch13 -p1 -#skip test_io test for ppc,ppc64 as it is broken. -%ifarch ppc ppc64 ppc64le -%patch15 -p1 -%endif %patch17 -p1 %patch18 -p1 %patch20 -p1