diff options
| author | Pavel Labath <pavel@labath.sk> | 2020-12-18 21:52:26 +0100 |
|---|---|---|
| committer | Pavel Labath <pavel@labath.sk> | 2020-12-27 13:58:10 +0100 |
| commit | bd39a5cb30a34547eb56a81eb7ca8aca23544099 (patch) | |
| tree | 401808005e488d1f8d8355d2de7a8738b50152fc /lldb/packages/Python/lldbsuite/test | |
| parent | aca4488847b4ddceeda8d4ddb2cd9cb3defbab0c (diff) | |
| download | llvm-bd39a5cb30a34547eb56a81eb7ca8aca23544099.zip llvm-bd39a5cb30a34547eb56a81eb7ca8aca23544099.tar.gz llvm-bd39a5cb30a34547eb56a81eb7ca8aca23544099.tar.bz2 | |
[lldb/test] Automatically skip remote lldb-server tests when applicable
The tests don't work with remote debugservers. This isn't a problem with
any particular test, but the test infrastructure itself, which is why
each of these tests has a @skipIfDarwinEmbedded decorator.
This patch replaces that with a central category-based solution. It also
moves the ad-hoc windows skipping mechanism there too.
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/dotest.py | 9 | ||||
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py index 86ea34e..c728bf3 100644 --- a/lldb/packages/Python/lldbsuite/test/dotest.py +++ b/lldb/packages/Python/lldbsuite/test/dotest.py @@ -852,11 +852,20 @@ def checkDebugInfoSupport(): def checkDebugServerSupport(): from lldbsuite.test import lldbplatformutil + import lldb + skip_msg = "Skipping %s tests, as they are not compatible with remote testing on this platform" if lldbplatformutil.platformIsDarwin(): configuration.skip_categories.append("llgs") + if lldb.remote_platform: + # <rdar://problem/34539270> + configuration.skip_categories.append("debugserver") + print(skip_msg%"debugserver"); else: configuration.skip_categories.append("debugserver") + if lldb.remote_platform and lldbplatformutil.getPlatform() == "windows": + configuration.skip_categories.append("llgs") + print(skip_msg%"lldb-server"); def run_suite(): # On MacOS X, check to make sure that domain for com.apple.DebugSymbols defaults diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py index d928925..71e75ad 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/gdbremote_testcase.py @@ -199,9 +199,7 @@ class GdbRemoteTestCaseBase(Base): # Reverse connections may be tricky due to firewalls/NATs. reverse_connect = False - triple = self.dbg.GetSelectedPlatform().GetTriple() - if re.match(".*-.*-windows", triple): - self.skipTest("Remotely testing is not supported on Windows yet.") + # FIXME: This is extremely linux-oriented # Grab the ppid from /proc/[shell pid]/stat err, retcode, shell_stat = self.run_platform_command( |