Merge pull request #1216 from dcci/bacini-bacetti

Cherry-pick from upstream/llvm.org an handful of test suite fixes.

Author: dcci

lldb/test/API/functionalities/thread/step_out/TestThreadStepOut.py

@@ -70,9 +70,9 @@ def setUp(self):
         self.bkpt_string = '// Set breakpoint here'
         self.breakpoint = line_number('main.cpp', self.bkpt_string)       
 
-        if "gcc" in self.getCompiler() or self.isIntelCompiler() or self.getArchitecture() in ['arm64', 'arm64e']:
+        if "gcc" in self.getCompiler() or self.isIntelCompiler():
             self.step_out_destination = line_number(
-                'main.cpp', '// Expect to stop here after step-out (icc and gcc; arm64)')
+                'main.cpp', '// Expect to stop here after step-out (icc and gcc)')
         else:
             self.step_out_destination = line_number(
                 'main.cpp', '// Expect to stop here after step-out (clang)')

lldb/test/API/functionalities/thread/step_out/main.cpp

@@ -30,7 +30,7 @@ thread_func ()
     step_out_of_here(); // Expect to stop here after step-out (clang)
 
     // Return
-    return NULL;  // Expect to stop here after step-out (icc and gcc; arm64)
+    return NULL;  // Expect to stop here after step-out (icc and gcc)
 }
 
 int main ()

lldb/test/API/macosx/indirect_symbol/TestIndirectSymbols.py

@@ -19,7 +19,6 @@ def setUp(self):
         self.main_source = "main.c"
 
     @skipUnlessDarwin
-    @expectedFailureAll(oslist=no_match(["macosx"]), bugnumber="rdar://55952764")
     @add_test_categories(['pyapi'])
     def test_with_python_api(self):
         """Test stepping and setting breakpoints in indirect and re-exported symbols."""
@@ -29,10 +28,9 @@ def test_with_python_api(self):
         target = self.dbg.CreateTarget(exe)
         self.assertTrue(target, VALID_TARGET)
 
-        if self.platformIsDarwin():
-            lib1 = self.getBuildArtifact('libindirect.dylib')
-            lib2 = self.getBuildArtifact('libreexport.dylib')
-            self.registerSharedLibrariesWithTarget(target, [lib1, lib2])
+        lib1 = self.getBuildArtifact('libindirect.dylib')
+        lib2 = self.getBuildArtifact('libreexport.dylib')
+        self.registerSharedLibrariesWithTarget(target, [lib1, lib2])
 
         self.main_source_spec = lldb.SBFileSpec(self.main_source)