Revert "[lldb][test] Add support for building Wasm test inferiors"#193493
Merged
Conversation
Member
|
@llvm/pr-subscribers-lldb Author: David Spickett (DavidSpickett) ChangesReverts llvm/llvm-project#192872 Buildbot failures reported. Full diff: https://github.com/llvm/llvm-project/pull/193493.diff 11 Files Affected:
diff --git a/lldb/packages/Python/lldbsuite/test/builders/builder.py b/lldb/packages/Python/lldbsuite/test/builders/builder.py
index 8e769e4a88747..03c1af579b018 100644
--- a/lldb/packages/Python/lldbsuite/test/builders/builder.py
+++ b/lldb/packages/Python/lldbsuite/test/builders/builder.py
@@ -245,14 +245,7 @@ def getLibCxxArgs(self):
return []
def getLLDBObjRoot(self):
- if configuration.lldb_obj_root:
- return [f"LLDB_OBJ_ROOT={configuration.lldb_obj_root}"]
- return []
-
- def getResourceDirArgs(self):
- if configuration.resource_dir:
- return [f"RESOURCE_DIR={configuration.resource_dir}"]
- return []
+ return ["LLDB_OBJ_ROOT={}".format(configuration.lldb_obj_root)]
def _getDebugInfoArgs(self, debug_info):
if debug_info is None:
@@ -305,7 +298,6 @@ def getBuildCommand(
self.getModuleCacheSpec(),
self.getLibCxxArgs(),
self.getLLDBObjRoot(),
- self.getResourceDirArgs(),
self.getCmdLine(dictionary),
]
command = list(itertools.chain(*command_parts))
diff --git a/lldb/packages/Python/lldbsuite/test/configuration.py b/lldb/packages/Python/lldbsuite/test/configuration.py
index e1189f0f31d03..d1c933b35fcdf 100644
--- a/lldb/packages/Python/lldbsuite/test/configuration.py
+++ b/lldb/packages/Python/lldbsuite/test/configuration.py
@@ -50,9 +50,6 @@
# Allow specifying a triple for cross compilation.
triple = None
-# Clang resource directory for cross compilation.
-resource_dir = None
-
# The overriden dwarf verison.
# Don't use this to test the current compiler's
# DWARF version, as this won't be set if the
diff --git a/lldb/packages/Python/lldbsuite/test/dotest.py b/lldb/packages/Python/lldbsuite/test/dotest.py
index 45a0d68e5364b..7f73fce14bcdd 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest.py
@@ -276,8 +276,6 @@ def parseOptionsAndInitTestdirs():
configuration.dsymutil = seven.get_command_output(
"xcrun -find -toolchain default dsymutil"
)
- if args.resource_dir:
- configuration.resource_dir = args.resource_dir
if args.llvm_tools_dir:
configuration.llvm_tools_dir = args.llvm_tools_dir
configuration.filecheck = shutil.which("FileCheck", path=args.llvm_tools_dir)
diff --git a/lldb/packages/Python/lldbsuite/test/dotest_args.py b/lldb/packages/Python/lldbsuite/test/dotest_args.py
index 27d8cc6ffb453..f3b0837bdc4ab 100644
--- a/lldb/packages/Python/lldbsuite/test/dotest_args.py
+++ b/lldb/packages/Python/lldbsuite/test/dotest_args.py
@@ -106,15 +106,6 @@ def create_parser():
dest="dsymutil",
help=textwrap.dedent("Specify which dsymutil to use."),
)
- group.add_argument(
- "--resource-dir",
- metavar="dir",
- dest="resource_dir",
- default="",
- help=textwrap.dedent(
- "Specify the clang resource directory for cross-compiling test inferiors."
- ),
- )
group.add_argument(
"--llvm-tools-dir",
metavar="dir",
diff --git a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
index cb2867f29ac7f..a3fab6e49c2a7 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbplatformutil.py
@@ -108,24 +108,7 @@ def finalize_build_dictionary(dictionary):
if dictionary is None:
dictionary = {}
-
- if configuration.triple:
- # When cross-compiling with an explicit triple, derive OS from it
- # rather than from the selected platform.
- triple_os = (
- configuration.triple.split("-")[1] if "-" in configuration.triple else ""
- )
- if triple_os.startswith("wasi"):
- dictionary["OS"] = "WASI"
- elif triple_os == "linux" or triple_os.startswith("linux"):
- dictionary["OS"] = "Linux"
- elif triple_os == "windows" or triple_os.startswith("windows"):
- dictionary["OS"] = "Windows_NT"
- elif triple_os == "apple":
- dictionary["OS"] = "Darwin"
- else:
- dictionary["OS"] = triple_os
- elif target_is_android():
+ if target_is_android():
dictionary["OS"] = "Android"
dictionary["PIE"] = 1
elif platformIsDarwin():
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 5289a5ef0a189..f2a9f3bba1993 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -822,7 +822,7 @@ def setUpCommands(cls):
# Set any user-overridden settings.
for setting, value in configuration.settings:
- commands.append("settings set -- %s %s" % (setting, value))
+ commands.append("setting set %s %s" % (setting, value))
# Make sure that a sanitizer LLDB's environment doesn't get passed on.
if (
diff --git a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
index fc1681606be9b..5cff3f5d91539 100644
--- a/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
+++ b/lldb/packages/Python/lldbsuite/test/make/Makefile.rules
@@ -118,10 +118,6 @@ ifeq "$(OS)" "Android"
include $(THIS_FILE_DIR)/Android.rules
endif
-ifeq "$(OS)" "WASI"
- include $(THIS_FILE_DIR)/WASI.rules
-endif
-
ifeq "$(TRIPLE)" ""
ifeq "$(ARCH)" ""
# No triple, no arch: query the compiler for its default triple.
@@ -176,11 +172,7 @@ ifeq "$(OS)" "Darwin"
else
ifneq "$(SDKROOT)" ""
SYSROOT_FLAGS := --sysroot "$(SDKROOT)"
- ifeq "$(OS)" "WASI"
- GCC_TOOLCHAIN_FLAGS :=
- else
- GCC_TOOLCHAIN_FLAGS := --gcc-toolchain="$(SDKROOT)/usr"
- endif
+ GCC_TOOLCHAIN_FLAGS := --gcc-toolchain="$(SDKROOT)/usr"
else
# Do not set up these options if SDKROOT was not specified.
# This is a regular build in that case (or Android).
diff --git a/lldb/packages/Python/lldbsuite/test/make/WASI.rules b/lldb/packages/Python/lldbsuite/test/make/WASI.rules
deleted file mode 100644
index 190a9e423c5ff..0000000000000
--- a/lldb/packages/Python/lldbsuite/test/make/WASI.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-USE_SYSTEM_STDLIB = 1
-
-ifneq "$(RESOURCE_DIR)" ""
- ARCH_CFLAGS += -resource-dir $(RESOURCE_DIR)
-endif
-
-ARCH_CXXFLAGS += \
- -fno-exceptions
-
-ARCH_LDFLAGS += \
- $(if $(RESOURCE_DIR),-resource-dir $(RESOURCE_DIR)) \
- -Wl,--export-all \
- -Wl,--no-entry \
- -Wl,--allow-undefined
diff --git a/lldb/test/API/CMakeLists.txt b/lldb/test/API/CMakeLists.txt
index bff3bac438d6b..0738278c63a9c 100644
--- a/lldb/test/API/CMakeLists.txt
+++ b/lldb/test/API/CMakeLists.txt
@@ -92,8 +92,6 @@ set(LLDB_TEST_EXECUTABLE "${LLDB_DEFAULT_TEST_EXECUTABLE}" CACHE PATH "lldb exec
set(LLDB_TEST_COMPILER "${LLDB_DEFAULT_TEST_COMPILER}" CACHE PATH "C Compiler to use for building LLDB test inferiors")
set(LLDB_TEST_DSYMUTIL "${LLDB_DEFAULT_TEST_DSYMUTIL}" CACHE PATH "dsymutil used for generating dSYM bundles")
set(LLDB_TEST_MAKE "${LLDB_DEFAULT_TEST_MAKE}" CACHE PATH "make tool used for building test executables")
-set(LLDB_TEST_RESOURCE_DIR "" CACHE PATH "Clang resource directory for cross-compiling test inferiors")
-set(LLDB_TEST_SYSROOT "" CACHE PATH "Sysroot for cross-compiling test inferiors")
if ("${LLDB_TEST_COMPILER}" STREQUAL "")
message(FATAL_ERROR "LLDB test compiler not specified. Tests will not run.")
diff --git a/lldb/test/API/lit.cfg.py b/lldb/test/API/lit.cfg.py
index f58e1e5ace5a3..c92b104c9227c 100644
--- a/lldb/test/API/lit.cfg.py
+++ b/lldb/test/API/lit.cfg.py
@@ -323,8 +323,6 @@ def delete_module_cache(path):
dotest_cmd += ["--platform-working-dir", config.lldb_platform_working_dir]
if is_configured("cmake_sysroot"):
dotest_cmd += ["--sysroot", config.cmake_sysroot]
-if is_configured("test_resource_dir"):
- dotest_cmd += ["--resource-dir", config.test_resource_dir]
if is_configured("dotest_user_args_str"):
dotest_cmd.extend(config.dotest_user_args_str.split(";"))
diff --git a/lldb/test/API/lit.site.cfg.py.in b/lldb/test/API/lit.site.cfg.py.in
index b1070c24bbb72..b7cd281425d7e 100644
--- a/lldb/test/API/lit.site.cfg.py.in
+++ b/lldb/test/API/lit.site.cfg.py.in
@@ -43,7 +43,6 @@ config.libcxx_libs_dir = "@LIBCXX_LIBRARY_DIR@"
config.libcxx_include_dir = "@LIBCXX_GENERATED_INCLUDE_DIR@"
config.libcxx_include_target_dir = "@LIBCXX_GENERATED_INCLUDE_TARGET_DIR@"
config.lldb_launcher = "@LLDB_LAUNCHER@"
-config.test_resource_dir = "@LLDB_TEST_RESOURCE_DIR@"
config.lldb_enable_mte = @LLDB_ENABLE_MTE@
config.lldb_enable_arm64e_debugserver = @LLDB_USE_ARM64E_DEBUGSERVER@
# The API tests use their own module caches.
|
linuxlonelyeagle
pushed a commit
to linuxlonelyeagle/llvm-project
that referenced
this pull request
Apr 23, 2026
…lvm#193493) Reverts llvm#192872 Buildbot failures reported.
yingopq
pushed a commit
to yingopq/llvm-project
that referenced
this pull request
Apr 29, 2026
…lvm#193493) Reverts llvm#192872 Buildbot failures reported.
KHicketts
pushed a commit
to KHicketts/llvm-project
that referenced
this pull request
Apr 30, 2026
…lvm#193493) Reverts llvm#192872 Buildbot failures reported.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Reverts #192872
Buildbot failures reported.