From: Alp Toker <alp@nuanti.com>
Date: Mon, 28 Oct 2013 10:26:13 +0000 (+0000)
Subject: lit: multiprocessing platform fix attempt
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=188545867dbcd0a6870b19c6b06d49610e7cda93;p=oota-llvm.git

lit: multiprocessing platform fix attempt

The error raised by Python varies by platform(!), so let's just catch any
exception and fall back.

Thanks to Sylvestre Ledru for noticing this on a Debian / Python 2.7 system
running code coverage.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@193516 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/lit/lit/run.py b/utils/lit/lit/run.py
index e3d9344d694..27c414d6dd6 100644
--- a/utils/lit/lit/run.py
+++ b/utils/lit/lit/run.py
@@ -216,9 +216,10 @@ class Run(object):
                 queue_impl = multiprocessing.Queue
                 canceled_flag =  multiprocessing.Value('i', 0)
                 consumer = MultiprocessResultsConsumer(self, display, jobs)
-            except ImportError:
+            except:
                 # multiprocessing fails to initialize with certain OpenBSD and
                 # FreeBSD Python versions: http://bugs.python.org/issue3770
+                # Unfortunately the error raised also varies by platform.
                 self.lit_config.note('failed to initialize multiprocessing')
                 consumer = None
         if not consumer: