2 files changed, 7 insertions, 1 deletions
diff --git a/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py b/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
index 20e41f0f4121a..dc1a0d19f83ef 100644
--- a/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
+++ b/packages/Python/lldbsuite/test/api/multiple-debuggers/TestMultipleDebuggers.py
@@ -6,6 +6,7 @@ from __future__ import print_function
 import os
 import re
 import subprocess
+import sys
 
 import lldb
 from lldbsuite.test.decorators import *
@@ -18,6 +19,7 @@ class TestMultipleSimultaneousDebuggers(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     @skipIfNoSBHeaders
+    @expectedFailureAll(bugnumber="rdar://30564102")
     @expectedFailureAll(
         archs="i[3-6]86",
         bugnumber="multi-process-driver.cpp creates an x64 target")
diff --git a/packages/Python/lldbsuite/test/api/multiple-debuggers/multi-process-driver.cpp b/packages/Python/lldbsuite/test/api/multiple-debuggers/multi-process-driver.cpp
index 448304d83c75b..15170a3e5eb56 100644
--- a/packages/Python/lldbsuite/test/api/multiple-debuggers/multi-process-driver.cpp
+++ b/packages/Python/lldbsuite/test/api/multiple-debuggers/multi-process-driver.cpp
@@ -15,7 +15,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-
+#include <string.h>
 
 #include "lldb/API/LLDB.h"
 #include "lldb/API/SBCommandInterpreter.h"
@@ -217,6 +217,10 @@ void *do_one_debugger (void *in)
 
 int main (int argc, char **argv)
 {
+#if !defined(_MSC_VER)
+  signal(SIGPIPE, SIG_IGN);
+#endif
+  
     SBDebugger::Initialize();
 
     completed_threads_array = (bool *) malloc (sizeof (bool) * NUMBER_OF_SIMULTANEOUS_DEBUG_SESSIONS);