[LLDB] Only run lldb-server Shell tests if it gets built

[bulbazord]

Summary

It's easy enough to disable the lldb-server build. The lldb-server unit tests already have logic to disable them if we don't build, so this just makes it even.

[DavidSpickett]

Would a lit.local.cfg work in this folder (lldb/test/Shell/lldb-server/ that is)? That would automatically apply it to all existing and future tests.

llvm/test/MC/AArch64/lit.local.cfg is one example.

[bulbazord]

In D135825#3855539, @DavidSpickett wrote:

Would a lit.local.cfg work in this folder (lldb/test/Shell/lldb-server/ that is)? That would automatically apply it to all existing and future tests.

llvm/test/MC/AArch64/lit.local.cfg is one example.

Just tried this out, seems like it will work for the purposes of this patch. I'll update this patch when I have a moment. Thanks for reviewing! :)

[bulbazord]

Implement David's suggestion

[DavidSpickett]

LGTM, thanks for the fix.

lldb/test/CMakeLists.txt

 llvm_canonicalize_cmake_booleans(
   LLDB_BUILD_INTEL_PT
   LLDB_ENABLE_PYTHON
   LLDB_ENABLE_LUA
   LLDB_ENABLE_LZMA
   LLVM_ENABLE_ZLIB
   LLVM_ENABLE_SHARED_LIBS
   LLDB_HAS_LIBCXX
+  LLDB_TOOL_LLDB_SERVER_BUILD
   LLDB_USE_SYSTEM_DEBUGSERVER
   LLDB_IS_64_BITS)
 
 # Configure the individual test suites.
 add_subdirectory(API)
 add_subdirectory(Shell)
 add_subdirectory(Unit)
 

lldb/test/Shell/lit.cfg.py

if config.lldb_enable_lzma:
     config.available_features.add('lzma')
 
 if shutil.which('xz') != None:
     config.available_features.add('xz')
 
 if config.lldb_system_debugserver:
     config.available_features.add('system-debugserver')
 
+if config.have_lldb_server:
+    config.available_features.add('lldb-server')
+
 # NetBSD permits setting dbregs either if one is root
 # or if user_set_dbregs is enabled
 can_set_dbregs = True
 if platform.system() == 'NetBSD' and os.geteuid() != 0:
     try:
         output = subprocess.check_output(["/sbin/sysctl", "-n",
           "security.models.extensions.user_set_dbregs"]).decode().strip()
         if output != "1":
             can_set_dbregs = False
     except subprocess.CalledProcessError:
         can_set_dbregs = False
 if can_set_dbregs:
     config.available_features.add('dbregs-set')
 
 if 'LD_PRELOAD' in os.environ:
     config.available_features.add('ld_preload-present')

lldb/test/Shell/lit.site.cfg.py.in

 config.python_executable = "@Python3_EXECUTABLE@"
 config.have_zlib = @LLVM_ENABLE_ZLIB@
 config.lldb_enable_lzma = @LLDB_ENABLE_LZMA@
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.lldb_bitness = 64 if @LLDB_IS_64_BITS@ else 32
 config.lldb_enable_python = @LLDB_ENABLE_PYTHON@
 config.lldb_enable_lua = @LLDB_ENABLE_LUA@
 config.lldb_build_directory = "@LLDB_TEST_BUILD_DIRECTORY@"
+config.have_lldb_server = @LLDB_TOOL_LLDB_SERVER_BUILD@
 config.lldb_system_debugserver = @LLDB_USE_SYSTEM_DEBUGSERVER@
 # The shell tests use their own module caches.
 config.lldb_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_LLDB@", "lldb-shell")
 config.clang_module_cache = os.path.join("@LLDB_TEST_MODULE_CACHE_CLANG@", "lldb-shell")
 
 import lit.llvm
 lit.llvm.initialize(lit_config, config)
 
 # Let the main config do the real work.
 lit_config.load_config(config, os.path.join(config.lldb_src_root, "test", "Shell", "lit.cfg.py"))

lldb/test/Shell/lldb-server/lit.local.cfg

+# These tests rely on lldb-server
+if not config.have_lldb_server:
+    config.unsupported = True