From cb4cda2d45e15aa01d3deb1e8779d2b0a22133e0 Mon Sep 17 00:00:00 2001 From: Jonas Devlieghere Date: Tue, 24 Sep 2019 22:39:04 +0000 Subject: [CMake] Copy over the system debugserver when using LLDB_USE_SYSTEM_DEBUGSERVER r366433 broke support for the system debugserver. Although the change was well-intended, it (presumably) unintentionally removed the logic to copy over the debugserver. As a result, even with LLDB_USE_SYSTEM_DEBUGSERVER enabled, we ended up building, signing and using the just-built debugserver. This patch partially recovers the old behavior: when LLDB_USE_SYSTEM_DEBUGSERVER is set we don't build debugserver and just copy over the system one. Differential revision: https://reviews.llvm.org/D67991 llvm-svn: 372786 --- .../thread/concurrent_events/TestConcurrentManyBreakpoints.py | 1 + .../functionalities/thread/concurrent_events/TestConcurrentManyCrash.py | 1 + .../thread/concurrent_events/TestConcurrentManySignals.py | 1 + .../thread/concurrent_events/TestConcurrentManyWatchpoints.py | 1 + 4 files changed, 4 insertions(+) (limited to 'lldb/packages/Python/lldbsuite/test/functionalities/thread') 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()) -- cgit v1.2.3