Revert "[lldb][test] Add support for building Wasm test inferiors"

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))

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

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)

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",

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():

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 (

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).

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.")

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(";"))

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.