Revert this patch; I was emailing with Eugene and they have some other changes going

in today and don't want the two changes to confuse the situation with the build bots.
I'll commit tomorrow once they're known good.

llvm-svn: 313934

8 files changed, 18 insertions, 29 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/main.mm b/lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/main.mm
index 9d4630dc7c4..f7383a5a14d 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/main.mm
+++ b/lldb/packages/Python/lldbsuite/test/python_api/exprpath_synthetic/main.mm
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
 #include <vector>
 
 int main (int argc, char const *argv[])
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py b/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
index a2d2cf12cdc..06ca772073a 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/frame/TestFrames.py
@@ -90,7 +90,7 @@ class FrameAPITestCase(TestBase):
                 # Make sure on arm targets we dont mismatch PC value on the basis of thumb bit.
                 # Frame PC will not have thumb bit set in case of a thumb
                 # instruction as PC.
-                if self.getArchitecture() in ['arm', 'armv7', 'armv7k']:
+                if self.getArchitecture() in ['arm']:
                     pc_value_int &= ~1
                 self.assertTrue(
                     pc_value_int == frame.GetPC(),
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
index fb4e54aa0bc..44dd4a61850 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py
@@ -79,7 +79,6 @@ class HelloWorldTestCase(TestBase):
     @add_test_categories(['pyapi'])
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24600")
     @skipIfiOSSimulator
-    @expectedFailureAll(oslist=['ios', 'watchos', 'tvos', 'bridgeos'], bugnumber="<rdar://problem/34538611>") # old lldb-server has race condition, launching an inferior and then launching debugserver in quick succession sometimes fails
     def test_with_attach_to_process_with_id_api(self):
         """Create target, spawn a process, and attach to it with process id."""
         self.build(dictionary=self.d)
@@ -109,7 +108,6 @@ class HelloWorldTestCase(TestBase):
     @add_test_categories(['pyapi'])
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr24600")
     @skipIfiOSSimulator
-    @expectedFailureAll(oslist=['ios', 'watchos', 'tvos', 'bridgeos'], bugnumber="<rdar://problem/34538611>") # old lldb-server has race condition, launching an inferior and then launching debugserver in quick succession sometimes fails
     def test_with_attach_to_process_with_name_api(self):
         """Create target, spawn a process, and attach to it with process name."""
         self.build(dictionary=self.d)
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/main.c b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/main.c
index 001e9c01e6e..1b942d0db15 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/hello_world/main.c
+++ b/lldb/packages/Python/lldbsuite/test/python_api/hello_world/main.c
@@ -1,5 +1,5 @@
 #include <stdio.h>
-#include <unistd.h>
+
 int main(int argc, char const *argv[])
 {
     lldb_enable_attach();
@@ -10,8 +10,9 @@ int main(int argc, char const *argv[])
 
     // Waiting to be attached by the debugger, otherwise.
     char line[100];
-    while (1) 
-        sleep (1); // Waiting to be attached...
+    while (fgets(line, sizeof(line), stdin)) { // Waiting to be attached...
+        printf("input line=>%s\n", line);
+    }
 
     printf("Exiting now\n");
 }
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
index a19cc5c375f..49a78888ad8 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/TestRegistersIterator.py
@@ -76,18 +76,17 @@ class RegistersIteratorTestCase(TestBase):
 
                     REGs = lldbutil.get_ESRs(frame)
                     if self.platformIsDarwin():
-                        if self.getArchitecture() != 'armv7' and self.getArchitecture() != 'armv7k':
-                            num = len(REGs)
+                        num = len(REGs)
+                        if self.TraceOn():
+                            print(
+                                "\nNumber of exception state registers: %d" %
+                                num)
+                        for reg in REGs:
+                            self.assertTrue(reg)
                             if self.TraceOn():
                                 print(
-                                    "\nNumber of exception state registers: %d" %
-                                    num)
-                            for reg in REGs:
-                                self.assertTrue(reg)
-                                if self.TraceOn():
-                                    print(
-                                        "%s => %s" %
-                                        (reg.GetName(), reg.GetValue()))
+                                    "%s => %s" %
+                                    (reg.GetName(), reg.GetValue()))
                     else:
                         self.assertIsNone(REGs)
 
@@ -100,8 +99,7 @@ class RegistersIteratorTestCase(TestBase):
                     REGs = lldbutil.get_registers(
                         frame, "Exception State Registers")
                     if self.platformIsDarwin():
-                        if self.getArchitecture() != 'armv7' and self.getArchitecture() != 'armv7k':
-                            self.assertIsNotNone(REGs)
+                        self.assertIsNotNone(REGs)
                     else:
                         self.assertIsNone(REGs)
 
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py b/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
index 71f77b36880..5314930ff99 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/process/io/TestProcessIO.py
@@ -59,7 +59,6 @@ class ProcessIOTestCase(TestBase):
     @skipIfWindows  # stdio manipulation unsupported on Windows
     @add_test_categories(['pyapi'])
     @expectedFlakeyLinux(bugnumber="llvm.org/pr26437")
-    @skipIfDarwinEmbedded # debugserver can't create/write files on the device
     def test_stdout_redirection(self):
         """Exercise SBLaunchInfo::AddOpenFileAction() for STDOUT without specifying STDIN or STDERR."""
         self.build()
@@ -73,7 +72,6 @@ class ProcessIOTestCase(TestBase):
     @skipIfWindows  # stdio manipulation unsupported on Windows
     @add_test_categories(['pyapi'])
     @expectedFlakeyLinux(bugnumber="llvm.org/pr26437")
-    @skipIfDarwinEmbedded # debugserver can't create/write files on the device
     def test_stderr_redirection(self):
         """Exercise SBLaunchInfo::AddOpenFileAction() for STDERR without specifying STDIN or STDOUT."""
         self.build()
@@ -87,7 +85,6 @@ class ProcessIOTestCase(TestBase):
     @skipIfWindows  # stdio manipulation unsupported on Windows
     @add_test_categories(['pyapi'])
     @expectedFlakeyLinux(bugnumber="llvm.org/pr26437")
-    @skipIfDarwinEmbedded # debugserver can't create/write files on the device
     def test_stdout_stderr_redirection(self):
         """Exercise SBLaunchInfo::AddOpenFileAction() for STDOUT and STDERR without redirecting STDIN."""
         self.build()
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/main.m b/lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/main.m
index 6ac70d1d06b..599d36107f4 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/main.m
+++ b/lldb/packages/Python/lldbsuite/test/python_api/sbtype_typeclass/main.m
@@ -6,7 +6,7 @@
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
-#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
 
 @interface ThisClassTestsThings : NSObject
 @end
diff --git a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
index 7ce312f52de..33f1be77ad5 100644
--- a/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
+++ b/lldb/packages/Python/lldbsuite/test/python_api/watchpoint/TestWatchpointIter.py
@@ -19,10 +19,6 @@ class WatchpointIteratorTestCase(TestBase):
 
     mydir = TestBase.compute_mydir(__file__)
 
-    # hardware watchpoints are not reported with a hardware index # on armv7 on ios devices
-    def affected_by_radar_34564183(self):
-        return (self.getArchitecture() == 'armv7' or self.getArchitecture() == 'armv7k') and self.platformIsDarwin()
-
     def setUp(self):
         # Call super's setUp().
         TestBase.setUp(self)
@@ -103,8 +99,7 @@ class WatchpointIteratorTestCase(TestBase):
         # meaningful hardware index at this point.  Exercise the printed repr of
         # SBWatchpointLocation.
         print(watchpoint)
-        if not self.affected_by_radar_34564183():
-            self.assertTrue(watchpoint.GetHardwareIndex() != -1)
+        self.assertTrue(watchpoint.GetHardwareIndex() != -1)
 
         # SBWatchpoint.GetDescription() takes a description level arg.
         print(lldbutil.get_description(watchpoint, lldb.eDescriptionLevelFull))