diff options
7 files changed, 13 insertions, 5 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py index 9814c0ba9ad..0ceaed937a9 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyBreakpoints.py @@ -15,6 +15,7 @@ class ConcurrentManyBreakpoints(ConcurrentEventsBase): # Atomic sequences are not supported yet for MIPS in LLDB. @skipIf(triple='^mips') @expectedFailureNetBSD + @skipIfOutOfTreeDebugserver def test(self): """Test 100 breakpoints from 100 threads.""" self.build(dictionary=self.getBuildFlags()) diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py index c4e8f11b823..945b1b9a340 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyCrash.py @@ -15,6 +15,7 @@ class ConcurrentManyCrash(ConcurrentEventsBase): # Atomic sequences are not supported yet for MIPS in LLDB. @skipIf(triple='^mips') @expectedFailureNetBSD + @skipIfOutOfTreeDebugserver def test(self): """Test 100 threads that cause a segfault.""" self.build(dictionary=self.getBuildFlags()) diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManySignals.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManySignals.py index ca179cf4ca9..35e4bb3e83f 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManySignals.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManySignals.py @@ -17,6 +17,7 @@ class ConcurrentManySignals(ConcurrentEventsBase): # This test is flaky on Darwin. @skipIfDarwin @expectedFailureNetBSD + @skipIfOutOfTreeDebugserver def test(self): """Test 100 signals from 100 threads.""" self.build(dictionary=self.getBuildFlags()) diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py index 25a40d2c768..cce537ac77a 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py +++ b/lldb/packages/Python/lldbsuite/test/functionalities/thread/concurrent_events/TestConcurrentManyWatchpoints.py @@ -16,6 +16,7 @@ class ConcurrentManyWatchpoints(ConcurrentEventsBase): @skipIf(triple='^mips') @expectedFailureNetBSD @add_test_categories(["watchpoint"]) + @skipIfOutOfTreeDebugserver def test(self): """Test 100 watchpoints from 100 threads.""" self.build(dictionary=self.getBuildFlags()) diff --git a/lldb/test/CMakeLists.txt b/lldb/test/CMakeLists.txt index 3bfb2332862..56e0c74bc68 100644 --- a/lldb/test/CMakeLists.txt +++ b/lldb/test/CMakeLists.txt @@ -97,6 +97,10 @@ if(CMAKE_HOST_APPLE) if(LLDB_USE_SYSTEM_DEBUGSERVER) lldb_find_system_debugserver(system_debugserver_path) + add_custom_target(debugserver + COMMAND ${CMAKE_COMMAND} -E copy_if_different + ${system_debugserver_path} ${LLVM_RUNTIME_OUTPUT_INTDIR} + COMMENT "Copying the system debugserver to LLDB's binaries directory for testing.") message(STATUS "LLDB tests use out-of-tree debugserver: ${system_debugserver_path}") list(APPEND LLDB_TEST_COMMON_ARGS --out-of-tree-debugserver) elseif(TARGET debugserver) diff --git a/lldb/tools/CMakeLists.txt b/lldb/tools/CMakeLists.txt index 3556f9eceae..1585fd4dc4b 100644 --- a/lldb/tools/CMakeLists.txt +++ b/lldb/tools/CMakeLists.txt @@ -12,7 +12,9 @@ add_lldb_tool_subdirectory(lldb-vscode) if (CMAKE_SYSTEM_NAME MATCHES "Darwin") add_lldb_tool_subdirectory(darwin-debug) - add_lldb_tool_subdirectory(debugserver) + if(NOT LLDB_USE_SYSTEM_DEBUGSERVER) + add_lldb_tool_subdirectory(debugserver) + endif() endif() if (LLDB_CAN_USE_LLDB_SERVER) diff --git a/lldb/tools/debugserver/source/CMakeLists.txt b/lldb/tools/debugserver/source/CMakeLists.txt index aea8bb5d8e6..cfb46817e6d 100644 --- a/lldb/tools/debugserver/source/CMakeLists.txt +++ b/lldb/tools/debugserver/source/CMakeLists.txt @@ -28,7 +28,7 @@ function(get_debugserver_codesign_identity result) if(LLDB_CODESIGN_IDENTITY) set(${result} ${LLDB_CODESIGN_IDENTITY} PARENT_SCOPE) check_certificate(${LLDB_CODESIGN_IDENTITY} available) - if(NOT available AND NOT LLDB_USE_SYSTEM_DEBUGSERVER) + if(NOT available) message(WARNING "LLDB_CODESIGN_IDENTITY not found: '${LLDB_CODESIGN_IDENTITY}' ${not_found_help}") endif() return() @@ -41,9 +41,7 @@ function(get_debugserver_codesign_identity result) return() endif() - if(NOT LLDB_USE_SYSTEM_DEBUGSERVER) - message(WARNING "Development code sign identiy not found: 'lldb_codesign' ${not_found_help}") - endif() + message(WARNING "Development code sign identiy not found: 'lldb_codesign' ${not_found_help}") # LLVM pendant: fallback if available if(LLVM_CODESIGNING_IDENTITY) |
