changeset:   90557:7f6d9990a9b1
parent:      90555:2c6a231e2c1e
parent:      90556:7ecb6e4b1077
user:        Ned Deily <nad@acm.org>
date:        Sat May 03 19:25:34 2014 -0700
description:
Issue #18604: merge from 3.4


diff -r 2c6a231e2c1e -r 7f6d9990a9b1 Lib/test/support/__init__.py
--- a/Lib/test/support/__init__.py	Sat May 03 19:06:32 2014 -0700
+++ b/Lib/test/support/__init__.py	Sat May 03 19:25:34 2014 -0700
@@ -434,7 +434,9 @@
                 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()