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

5 files changed, 5 insertions, 17 deletions

diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
index 16736f79852..a2d149f4b49 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/call-function/TestCallStdStringFunction.py
@@ -44,13 +44,5 @@ class ExprCommandCallFunctionTestCase(TestBase):
 
         # Calling this function now succeeds, but we follow the typedef return type through to
         # const char *, and thus don't invoke the Summary formatter.
-
-        # clang's libstdc++ on ios arm64 inlines std::string::c_str() always; 
-        # skip this part of the test.
-        triple = self.dbg.GetSelectedPlatform().GetTriple()
-        do_cstr_test = True
-        if triple == "arm64-apple-ios" or triple == "arm64-apple-tvos" or triple == "armv7k-apple-watchos" or triple == "arm64-apple-bridgeos":
-            do_cstr_test = False
-        if do_cstr_test:
-            self.expect("print str.c_str()",
-                        substrs=['Hello world'])
+        self.expect("print str.c_str()",
+                    substrs=['Hello world'])
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py b/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
index 445979f5c70..74991999d92 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/char/TestExprsChar.py
@@ -58,10 +58,7 @@ class ExprCharTestCase(TestBase):
     @expectedFailureAll(
         archs=[
             "i[3-6]86",
-            "x86_64",
-            "arm64",
-            'armv7',
-            'armv7k'],
+            "x86_64"],
         bugnumber="llvm.org/pr23069, <rdar://problem/28721938>")
     @expectedFailureAll(oslist=["windows"], bugnumber="llvm.org/pr21765")
     @expectedFailureAll(triple='mips*', bugnumber="llvm.org/pr23069")
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py b/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
index ba00ce32e5c..b99fb727e8a 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/persist_objc_pointeetype/TestPersistObjCPointeeType.py
@@ -26,7 +26,6 @@ class PersistObjCPointeeType(TestBase):
         bugnumber='http://llvm.org/pr23504',
         oslist=['macosx'], compiler='clang', compiler_version=['<', '7.0.0'])
     @skipIf(archs=["i386", "i686"])
-    @skipIf(debug_info="gmodules", archs=['arm64', 'armv7', 'armv7k'])  # compile error with gmodules for iOS
     def test_with(self):
         """Test that we can p *objcObject"""
         self.build()
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/Makefile b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/Makefile
index b6592745356..4464e2ee9f5 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/Makefile
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/Makefile
@@ -3,4 +3,4 @@ LEVEL = ../../make
 OBJC_SOURCES := main.m
 
 include $(LEVEL)/Makefile.rules
-LDFLAGS += -framework Foundation
+LDFLAGS += -framework Cocoa
diff --git a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/main.m b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/main.m
index 9c79f850bf2..3dbb024b280 100644
--- a/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/main.m
+++ b/lldb/packages/Python/lldbsuite/test/expression_command/po_verbosity/main.m
@@ -1,4 +1,4 @@
-#import <Foundation/Foundation.h>
+#import <Cocoa/Cocoa.h>
 
 int main()
 {