Merge pull request #2066 from fredriss/some-testsuite-improvements

apple-llvm-split-commit: e12ba79663f11b607853cafabf25f47963eebcc1
apple-llvm-split-dir: lldb/

Author: swift-ci

lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/TestMTCSimple.py

@@ -15,19 +15,12 @@ class MTCSimpleTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     @skipUnlessDarwin
-    @skipIfDarwinEmbedded  # Test file depends on AppKit which is not present on iOS etc.
     def test(self):
         self.mtc_dylib_path = findMainThreadCheckerDylib()
-        if self.mtc_dylib_path == "":
-            self.skipTest("This test requires libMainThreadChecker.dylib.")
-
+        self.assertTrue(self.mtc_dylib_path != "")
         self.build()
         self.mtc_tests()
 
-    def setUp(self):
-        # Call super's setUp().
-        TestBase.setUp(self)
-
     @skipIf(archs=['i386'])
     def mtc_tests(self):
         # Load the test
@@ -41,7 +34,11 @@ def mtc_tests(self):
         thread = process.GetSelectedThread()
         frame = thread.GetSelectedFrame()
 
-        self.expect("thread info", substrs=['stop reason = -[NSView superview] must be used from main thread only'])
+        view = "NSView" if lldbplatformutil.getPlatform() == "macosx" else "UIView"
+
+        self.expect("thread info",
+                    substrs=['stop reason = -[' + view +
+                             ' superview] must be used from main thread only'])
 
         self.expect(
             "thread info -s",
@@ -51,7 +48,7 @@ def mtc_tests(self):
         json_line = '\n'.join(output_lines[2:])
         data = json.loads(json_line)
         self.assertEqual(data["instrumentation_class"], "MainThreadChecker")
-        self.assertEqual(data["api_name"], "-[NSView superview]")
-        self.assertEqual(data["class_name"], "NSView")
+        self.assertEqual(data["api_name"], "-[" + view + " superview]")
+        self.assertEqual(data["class_name"], view)
         self.assertEqual(data["selector"], "superview")
-        self.assertEqual(data["description"], "-[NSView superview] must be used from main thread only")
+        self.assertEqual(data["description"], "-[" + view + " superview] must be used from main thread only")

lldb/packages/Python/lldbsuite/test/functionalities/mtc/simple/main.m

@@ -1,8 +1,14 @@
 #import <Foundation/Foundation.h>
+#if __has_include(<AppKit/AppKit.h>)
 #import <AppKit/AppKit.h>
+#define XXView NSView
+#else
+#import <UIKit/UIKit.h>
+#define XXView UIView
+#endif
 
 int main() {
-  NSView *view = [[NSView alloc] init];
+  XXView *view = [[XXView alloc] init];
   dispatch_group_t g = dispatch_group_create();
   dispatch_group_enter(g);
   [NSThread detachNewThreadWithBlock:^{

lldb/packages/Python/lldbsuite/test/lldbplatformutil.py

@@ -17,6 +17,7 @@
 # LLDB modules
 from . import configuration
 import lldb
+import lldbsuite.test.lldbplatform as lldbplatform
 
 
 def check_first_register_readable(test_case):
@@ -145,6 +146,9 @@ def findMainThreadCheckerDylib():
     if not platformIsDarwin():
         return ""
 
+    if getPlatform() in lldbplatform.translate(lldbplatform.darwin_embedded):
+        return "/Developer/usr/lib/libMainThreadChecker.dylib"
+
     with os.popen('xcode-select -p') as output:
         xcode_developer_path = output.read().strip()
         mtc_dylib_path = '%s/usr/lib/libMainThreadChecker.dylib' % xcode_developer_path

lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/Makefile

@@ -1,38 +1,16 @@
-include Makefile.rules
-
-LIB_PREFIX := lib
-
-ifeq "$(OS)" "Darwin"
-	CFLAGS += -arch $(ARCH)
-	DS := dsymutil
-	LD_FLAGS := -dynamiclib
-	LIB_INDIRECT := $(LIB_PREFIX)indirect.dylib
-	LIB_REEXPORT := $(LIB_PREFIX)reexport.dylib
-	EXEC_PATH := "@executable_path"
-	EXEC_PATH_INDIRECT := -install_name $(EXEC_PATH)/$(LIB_INDIRECT)
-	EXEC_PATH_REEXPORT := -install_name $(EXEC_PATH)/$(LIB_REEXPORT)
-endif
-
-all: a.out $(LIB_INDIRECT) $(LIB_REEXPORT)
+C_SOURCES := main.c
+LD_EXTRAS := -L. -lindirect -lreexport
 
-a.out: main.o $(LIB_INDIRECT) $(LIB_REEXPORT)
-	$(CC) $(CFLAGS) -o a.out main.o -L. $(LIB_INDIRECT) $(LIB_REEXPORT)
+.PHONY: build-libindirect build-libreepxoprt
+all: build-libindirect build-libreepxoprt a.out
 
-main.o: $(SRCDIR)/main.c
-	$(CC) $(CFLAGS) -c $(SRCDIR)/main.c
-
-$(LIB_INDIRECT): indirect.o
-	$(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_INDIRECT) -o $(LIB_INDIRECT) indirect.o
-	if [ "$(OS)" = "Darwin" ]; then dsymutil $(LIB_INDIRECT); fi
-
-indirect.o: $(SRCDIR)/indirect.c
-	$(CC) $(CFLAGS) -c $(SRCDIR)/indirect.c
+include Makefile.rules
 
-$(LIB_REEXPORT): reexport.o $(LIB_INDIRECT)
-	$(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_REEXPORT) -o $(LIB_REEXPORT) reexport.o -L. -lindirect -Wl,-alias_list,$(SRCDIR)/alias.list
-	if [ "$(OS)" = "Darwin" ]; then dsymutil $(LIB_REEXPORT); fi
+build-libindirect: indirect.c
+	$(MAKE) -f $(MAKEFILE_RULES) \
+		DYLIB_C_SOURCES=indirect.c DYLIB_NAME=indirect DYLIB_ONLY=YES
 
-reexport.o: $(SRCDIR)/reexport.c
-	$(CC) $(CFLAGS) -c $(SRCDIR)/reexport.c
-clean::
-	rm -rf $(wildcard *.o *~ *.dylib *.so a.out *.dSYM)
+build-libreepxoprt: reexport.c
+	$(MAKE) -f $(MAKEFILE_RULES) \
+		DYLIB_C_SOURCES=reexport.c DYLIB_NAME=reexport DYLIB_ONLY=YES \
+		LD_EXTRAS="-L. -lindirect -Wl,-alias_list,$(SRCDIR)/alias.list"

lldb/packages/Python/lldbsuite/test/macosx/indirect_symbol/TestIndirectSymbols.py

@@ -20,6 +20,7 @@ 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."""
@@ -61,8 +62,7 @@ def test_with_python_api(self):
         # indirect function.
         thread.StepInto()
         curr_function = thread.GetFrameAtIndex(0).GetFunctionName()
-        self.assertTrue(
-            curr_function == "call_through_indirect_hidden",
+        self.assertEqual(curr_function, "call_through_indirect_hidden",
             "Stepped into indirect symbols.")
 
         # Now set a breakpoint using the indirect symbol name, and make sure we

lldb/packages/Python/lldbsuite/test/make/Makefile.rules

@@ -746,6 +746,9 @@ ifneq "$(DYLIB_NAME)" ""
 ifeq "$(DYLIB_ONLY)" ""
 $(EXE) : $(OBJECTS) $(ARCHIVE_NAME) $(DYLIB_FILENAME)
 	$(LD) $(OBJECTS) $(ARCHIVE_NAME) -L. -l$(DYLIB_NAME) $(LDFLAGS) -o "$(EXE)"
+ifneq "$(CODESIGN)" ""
+	$(CODESIGN) -s - "$(EXE)"
+endif
 else
 EXE = $(DYLIB_FILENAME)
 endif

lldb/packages/Python/lldbsuite/test/python_api/hello_world/TestHelloWorld.py

@@ -78,17 +78,19 @@ def test_with_process_launch_api(self):
     @expectedFailureNetBSD
     def test_with_attach_to_process_with_id_api(self):
         """Create target, spawn a process, and attach to it with process id."""
-        exe = '%s_%d'%(self.getBuildArtifact(self.testMethodName), os.getpid())
+        exe = '%s_%d'%(self.testMethodName, os.getpid())
         d = {'EXE': exe}
         self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        target = self.dbg.CreateTarget(exe)
+        target = self.dbg.CreateTarget(self.getBuildArtifact(exe))
 
         # Spawn a new process
         token = exe+'.token'
-        if os.path.exists(token):
-            os.remove(token)
-        popen = self.spawnSubprocess(exe, [token])
+        if not lldb.remote_platform:
+            token = self.getBuildArtifact(token)
+            if os.path.exists(token):
+                os.remove(token)
+        popen = self.spawnSubprocess(self.getBuildArtifact(exe), [token])
         self.addTearDownHook(self.cleanupSubprocesses)
         lldbutil.wait_for_file_on_target(self, token)
 
@@ -110,17 +112,19 @@ def test_with_attach_to_process_with_id_api(self):
     @expectedFailureNetBSD
     def test_with_attach_to_process_with_name_api(self):
         """Create target, spawn a process, and attach to it with process name."""
-        exe = '%s_%d'%(self.getBuildArtifact(self.testMethodName), os.getpid())
+        exe = '%s_%d'%(self.testMethodName, os.getpid())
         d = {'EXE': exe}
         self.build(dictionary=d)
         self.setTearDownCleanup(dictionary=d)
-        target = self.dbg.CreateTarget(exe)
+        target = self.dbg.CreateTarget(self.getBuildArtifact(exe))
 
         # Spawn a new process.
         token = exe+'.token'
-        if os.path.exists(token):
-            os.remove(token)
-        popen = self.spawnSubprocess(exe, [token])
+        if not lldb.remote_platform:
+            token = self.getBuildArtifact(token)
+            if os.path.exists(token):
+                os.remove(token)
+        popen = self.spawnSubprocess(self.getBuildArtifact(exe), [token])
         self.addTearDownHook(self.cleanupSubprocesses)
         lldbutil.wait_for_file_on_target(self, token)
 

lldb/packages/Python/lldbsuite/test/tools/lldb-server/TestAppleSimulatorOSType.py

@@ -104,21 +104,21 @@ def check_simulator_ostype(self, sdk, platform, arch='x86_64'):
 
     @apple_simulator_test('iphone')
     @debugserver_test
-    @skipIfDarwinEmbedded
+    @skipIfRemote
     def test_simulator_ostype_ios(self):
         self.check_simulator_ostype(sdk='iphonesimulator',
                                     platform='ios')
 
     @apple_simulator_test('appletv')
     @debugserver_test
-    @skipIfDarwinEmbedded
+    @skipIfRemote
     def test_simulator_ostype_tvos(self):
         self.check_simulator_ostype(sdk='appletvsimulator',
                                     platform='tvos')
 
     @apple_simulator_test('watch')
     @debugserver_test
-    @skipIfDarwinEmbedded
+    @skipIfRemote
     def test_simulator_ostype_watchos(self):
         self.check_simulator_ostype(sdk='watchsimulator',
                                     platform='watchos', arch='i386')