diff options
author | Ned Deily <nad@acm.org> | 2014-11-01 19:26:45 -0700 |
---|---|---|
committer | Ned Deily <nad@acm.org> | 2014-11-01 19:26:45 -0700 |
commit | aa3260dffd0a73fb98615f41cfa6b782fd526456 (patch) | |
tree | bd11ef7cea3e1c4fb1abe7a89717d4fc85bea229 | |
parent | e023ae1578492733f6c421377d2e671274d036a4 (diff) | |
download | cpython-aa3260dffd0a73fb98615f41cfa6b782fd526456.tar.gz |
Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
When running tests in subprocesses with the regrtest -j option, a bug
in Cocoa Tk can result in a Tcl segfault. Avoid the problem by forcing
Tk to fully initialize as an OS X gui process before destroying the
Tcl instance and creating another. (Original patch by Serhiy Storchaka)
-rw-r--r-- | Lib/test/test_support.py | 5 | ||||
-rw-r--r-- | Misc/NEWS | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Lib/test/test_support.py b/Lib/test/test_support.py index 26b8e444b9..f4434595e8 100644 --- a/Lib/test/test_support.py +++ b/Lib/test/test_support.py @@ -326,12 +326,11 @@ def _is_gui_available(): reason = "cannot run without OS X gui process" # check on every platform whether tkinter can actually do anything - # but skip the test on OS X because it can cause segfaults in Cocoa Tk - # when running regrtest with the -j option (multiple threads/subprocesses) - if (not reason) and (sys.platform != 'darwin'): + if not reason: try: from Tkinter import Tk root = Tk() + root.update() root.destroy() except Exception as e: err_string = str(e) @@ -277,6 +277,8 @@ Tests - Issue #21976: Fix test_ssl to accept LibreSSL version strings. Thanks to William Orr. +- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests. + Build ----- |