diff options
| author | Ned Deily <nad@acm.org> | 2014-05-03 19:25:34 -0700 |
|---|---|---|
| committer | Ned Deily <nad@acm.org> | 2014-05-03 19:25:34 -0700 |
| commit | 71ac07f8baf21bf7a116e97accc12804f1afcdd4 (patch) | |
| tree | 7a0afbd8ade9f710fdcddea8c0ba43fe434a1a85 /Lib/test | |
| parent | 3170d1cccb15d7ad94658944e3aba1a1e753adbf (diff) | |
| parent | 88b5b6ddf60c38f54d0c656d883b0aed6cb03987 (diff) | |
| download | cpython-git-71ac07f8baf21bf7a116e97accc12804f1afcdd4.tar.gz | |
Issue #18604: merge from 3.4
Diffstat (limited to 'Lib/test')
| -rw-r--r-- | Lib/test/support/__init__.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Lib/test/support/__init__.py b/Lib/test/support/__init__.py index d26281a2fb..40aab96c30 100644 --- a/Lib/test/support/__init__.py +++ b/Lib/test/support/__init__.py @@ -434,7 +434,9 @@ def _is_gui_available(): reason = "cannot run without OS X gui process" # check on every platform whether tkinter can actually do anything - if not reason: + # 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'): try: from tkinter import Tk root = Tk() |