[llvm] a7968f6 - [gn] port 32e90bbe579d39356eb (lldb remote tests)

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2024-10-08T09:39:21-04:00
New Revision: a7968f6b636763a362939b2d2fb9717fdfbe5f7e

URL: https://github.com/llvm/llvm-project/commit/a7968f6b636763a362939b2d2fb9717fdfbe5f7e
DIFF: https://github.com/llvm/llvm-project/commit/a7968f6b636763a362939b2d2fb9717fdfbe5f7e.diff

LOG: [gn] port 32e90bbe579d39356eb (lldb remote tests)

Possibly not enough to run tests, but enough to fix build.

Added: 
    

Modified: 
    llvm/utils/gn/secondary/lldb/test/BUILD.gn

Removed: 
    


################################################################################
diff  --git a/llvm/utils/gn/secondary/lldb/test/BUILD.gn b/llvm/utils/gn/secondary/lldb/test/BUILD.gn
index 369b24f97d7b14..749fda78b4f171 100644
--- a/llvm/utils/gn/secondary/lldb/test/BUILD.gn
+++ b/llvm/utils/gn/secondary/lldb/test/BUILD.gn
@@ -52,6 +52,7 @@ write_lit_cfg("lit_api_site_cfg") {
   input = "//lldb/test/API/lit.site.cfg.py.in"
   output = lldb_lit_api_site_cfg_file
   extra_values = [
+    "DEFAULT_SYSROOT=",
     "LIBCXX_LIBRARY_DIR=" + rebase_path("$root_build_dir/lib"),
     "LIBCXX_GENERATED_INCLUDE_DIR=" +
         rebase_path("$root_build_dir/include/c++/v1"),
@@ -73,6 +74,9 @@ write_lit_cfg("lit_api_site_cfg") {
     "LLDB_TEST_MODULE_CACHE_LLDB=" +
         rebase_path(
             "$target_gen_dir/lldb-test-build.noindex/module-cache-lldb"),
+    "LLDB_TEST_PLATFORM_URL=",
+    "LLDB_TEST_PLATFORM_WORKING_DIR=",
+    "LLDB_TEST_SYSROOT=",
     "LLVM_BUILD_MODE=.",
     "LLVM_ENABLE_SHARED_LIBS=0",
     "LLVM_HOST_TRIPLE=$llvm_current_triple",
@@ -98,10 +102,12 @@ write_lit_cfg("lit_shell_site_cfg") {
   input = "//lldb/test/Shell/lit.site.cfg.py.in"
   output = lldb_lit_shell_site_cfg_file
   extra_values = [
-    "CMAKE_SYSROOT=",
+    "DEFAULT_SYSROOT=",
+    "LIBCXX_LIBRARY_DIR=" + rebase_path("$root_build_dir/lib"),
     "LLDB_ENABLE_LUA=0",  # FIXME: gn arg, use in Config.h
     "LLDB_ENABLE_LZMA=0",  # FIXME: gn arg, use in Config.h
     "LLDB_ENABLE_PYTHON=0",  # FIXME: gn arg, use in Config.h
+    "LLDB_HAS_LIBCXX=False",  # FIXME: support this (?)
     "LLDB_IS_64_BITS=1",
     "LLDB_LIBS_DIR=",  # FIXME: for shared builds only (?)
     "LLDB_LIT_TOOLS_DIR=",  # Intentionally empty, matches cmake build.
@@ -113,6 +119,10 @@ write_lit_cfg("lit_shell_site_cfg") {
         rebase_path(
             "$target_gen_dir/lldb-test-build.noindex/module-cache-lldb"),
     "LLDB_TEST_OBJC_GNUSTEP_DIR=",
+    "LLDB_TEST_PLATFORM_URL=",
+    "LLDB_TEST_PLATFORM_WORKING_DIR=",
+    "LLDB_TEST_SHELL_DISABLE_REMOTE=True",
+    "LLDB_TEST_SYSROOT=",
     "LLDB_TOOL_LLDB_SERVER_BUILD=1",
     "LLDB_TOOLS_DIR=" + rebase_path("$root_out_dir/bin"),
     "LLDB_USE_SYSTEM_DEBUGSERVER=1",  # XXX port //lldb/tools/debugserver (?)