[Lldb-commits] [lldb] 21c5bb0 - Recommit [lldb/test] Make category-skipping logic "platform"-independent
Pavel Labath via lldb-commits
lldb-commits at lists.llvm.org
Wed Mar 30 08:16:53 PDT 2022
Author: Pavel Labath
Date: 2022-03-30T17:16:37+02:00
New Revision: 21c5bb0a636c23ec75b13681c0a6fdb03ecd9c0d
URL: https://github.com/llvm/llvm-project/commit/21c5bb0a636c23ec75b13681c0a6fdb03ecd9c0d
DIFF: https://github.com/llvm/llvm-project/commit/21c5bb0a636c23ec75b13681c0a6fdb03ecd9c0d.diff
LOG: Recommit [lldb/test] Make category-skipping logic "platform"-independent
This recommits dddf4ce03, which was reverted because of a couple of test
failures on macos. The reason behind the failures was that the patch
inadvertenly changed the value returned by the host platform from
"macosx" to "darwin". The new version fixes that.
Original commit message was:
The decision which categories are relevant for a particular test run
happen very early in the test setup process. They use the SBPlatform
object to determine which categories should be skipped. The platform
object created for this purpose transcends individual test runs.
This setup is not compatible with the direction discussed in
<https://discourse.llvm.org/t/multiple-platforms-with-the-same-name/59594>
-- when platform objects are tied to a specific (SB)Debugger, they need
to be created alongside it, which currently happens in the test setUp
method.
This patch is the first step in that direction -- it rewrites the
category skipping logic to avoid depending on a global SBPlatform
object. Fortunately, the skipping logic is fairly simple (and I believe
it outght to stay that way) and mainly consists of comparing the
platform name against some hardcoded lists. This patch bases this
comparison on the platform name instead of the os part of the triple (as
reported by the platform).
Differential Revision: https://reviews.llvm.org/D121605
Added:
Modified:
lldb/packages/Python/lldbsuite/test/dotest.py
lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
lldb/test/API/functionalities/paths/TestPaths.py
Removed:
################################################################################
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index ce01146055b2c..5cf75391d8440 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -822,9 +822,9 @@ def checkObjcSupport():
configuration.skip_categories.append("objc")
def checkDebugInfoSupport():
- import lldb
+ from lldbsuite.test import lldbplatformutil
- platform = lldb.selected_platform.GetTriple().split('-')[2]
+ platform = lldbplatformutil.getPlatform()
compiler = configuration.compiler
for cat in test_categories.debug_info_categories:
if cat in configuration.categories_list:
@@ -840,14 +840,14 @@ def checkDebugServerSupport():
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:
+ if configuration.lldb_platform_name:
# <rdar://problem/34539270>
configuration.skip_categories.append("debugserver")
if configuration.verbose:
print(skip_msg%"debugserver");
else:
configuration.skip_categories.append("debugserver")
- if lldb.remote_platform and lldbplatformutil.getPlatform() == "windows":
+ if configuration.lldb_platform_name and lldbplatformutil.getPlatform() == "windows":
configuration.skip_categories.append("llgs")
if configuration.verbose:
print(skip_msg%"lldb-server");
@@ -881,7 +881,16 @@ def run_suite():
import lldb
lldb.SBDebugger.Initialize()
+ checkLibcxxSupport()
+ checkLibstdcxxSupport()
+ checkWatchpointSupport()
+ checkDebugInfoSupport()
+ checkDebugServerSupport()
+ checkObjcSupport()
+ checkForkVForkSupport()
+
# Use host platform by default.
+ lldb.remote_platform = None
lldb.selected_platform = lldb.SBPlatform.GetHostPlatform()
# Now we can also import lldbutil
@@ -938,14 +947,6 @@ def run_suite():
# Note that it's not dotest's job to clean this directory.
lldbutil.mkdir_p(configuration.test_build_dir)
- checkLibcxxSupport()
- checkLibstdcxxSupport()
- checkWatchpointSupport()
- checkDebugInfoSupport()
- checkDebugServerSupport()
- checkObjcSupport()
- checkForkVForkSupport()
-
print("Skipping the following test categories: {}".format(configuration.skip_categories))
for testdir in configuration.testdirs:
diff --git a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
index 94b133589dcc5..e14c4f8c0d383 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
@@ -57,12 +57,7 @@ def _run_adb_command(cmd, device_id):
def target_is_android():
- if not hasattr(target_is_android, 'result'):
- triple = lldb.selected_platform.GetTriple()
- match = re.match(".*-.*-.*-android", triple)
- target_is_android.result = match is not None
- return target_is_android.result
-
+ return configuration.lldb_platform_name == "remote-android"
def android_device_api():
if not hasattr(android_device_api, 'result'):
@@ -115,7 +110,7 @@ def getHostPlatform():
elif sys.platform.startswith('win32') or sys.platform.startswith('cygwin'):
return 'windows'
elif sys.platform.startswith('darwin'):
- return 'darwin'
+ return 'macosx'
elif sys.platform.startswith('freebsd'):
return 'freebsd'
elif sys.platform.startswith('netbsd'):
@@ -139,18 +134,16 @@ def getPlatform():
platform = 'ios'
return platform
- # Use the triple to determine the platform if set.
- triple = lldb.selected_platform.GetTriple()
- if triple:
- platform = triple.split('-')[2]
- if platform.startswith('freebsd'):
- platform = 'freebsd'
- elif platform.startswith('netbsd'):
- platform = 'netbsd'
- return platform
-
- # It still might be an unconnected remote platform.
- return ''
+ platform = configuration.lldb_platform_name
+ if platform is None:
+ platform = "host"
+ if platform == "qemu-user":
+ platform = "host"
+ if platform == "host":
+ return getHostPlatform()
+ if platform.startswith("remote-"):
+ return platform[7:]
+ return platform
def platformIsDarwin():
diff --git a/lldb/test/API/functionalities/paths/TestPaths.py b/lldb/test/API/functionalities/paths/TestPaths.py
index 9cc5e75913a21..5e9a79b596277 100644
--- a/lldb/test/API/functionalities/paths/TestPaths.py
+++ b/lldb/test/API/functionalities/paths/TestPaths.py
@@ -37,7 +37,7 @@ def test_paths(self):
shlib_dir = lldb.SBHostOS.GetLLDBPath(lldb.ePathTypeLLDBShlibDir).GetDirectory()
if lldbplatformutil.getHostPlatform() == 'windows':
filenames = ['liblldb.dll']
- elif lldbplatformutil.getHostPlatform() == 'darwin':
+ elif lldbplatformutil.getHostPlatform() == 'macosx':
filenames = ['LLDB', 'liblldb.dylib']
else:
filenames = ['liblldb.so']
More information about the lldb-commits
mailing list