[lit] Make lit-lldb-init configurable by CMake

[JDevlieghere]

Summary

This makes the lit-lldb-init file configurable by CMake. This matters to us downstream in swift, where we want to set environment variables with the env command for every test.

[stella.stamenova]

LGTM.

[JDevlieghere]

Undo reformatting

[davide]

LGTM.

lldb/lit/CMakeLists.txt

configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.site.cfg.py.in
   ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg.py
   MAIN_CONFIG
   ${CMAKE_CURRENT_SOURCE_DIR}/Unit/lit.cfg.py)
 configure_lit_site_cfg(
   ${CMAKE_CURRENT_SOURCE_DIR}/Suite/lit.site.cfg.in
   ${CMAKE_CURRENT_BINARY_DIR}/Suite/lit.site.cfg)
 
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/lit-lldb-init.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lit-lldb-init)
+
 if(NOT LLDB_BUILT_STANDALONE)
   list(APPEND LLDB_TEST_DEPS
     FileCheck
     count
     not
   )
 endif()
 

lldb/lit/helper/toolchain.py

build_script_args = [build_script,
                         '--arch=' + str(config.lldb_bitness)]
     if config.lldb_lit_tools_dir:
         build_script_args.append('--tools-dir={0}'.format(config.lldb_lit_tools_dir))
     if config.lldb_tools_dir:
         build_script_args.append('--tools-dir={0}'.format(config.lldb_tools_dir))
     if config.llvm_libs_dir:
         build_script_args.append('--libs-dir={0}'.format(config.llvm_libs_dir))
 
+    lldb_init = os.path.join(config.test_exec_root, 'lit-lldb-init')
+
     primary_tools = [
-        ToolSubst('%lldb',
-                  command=FindTool('lldb'),
-                  extra_args=['--no-lldbinit', '-S',
-                              os.path.join(config.test_source_root,
-                                           'lit-lldb-init')]),
-        ToolSubst('%lldb-init',
-                  command=FindTool('lldb'),
-                  extra_args=['-S',
-                              os.path.join(config.test_source_root,
-                                           'lit-lldb-init')]),
+        ToolSubst(
+            '%lldb',
+            extra_args=['--no-lldbinit', '-S', lldb_init]),
+        ToolSubst(
+            '%lldb-init',
+            extra_args=['-S', lldb_init]),
         lldbmi,
-        ToolSubst('%debugserver',
-                  command=FindTool(dsname),
-                  extra_args=dsargs,
-                  unresolved='ignore'),
-        ToolSubst('%platformserver',
-                  command=FindTool('lldb-server'),
-                  extra_args=['platform'],
-                  unresolved='ignore'),
+        ToolSubst(
+            '%debugserver',
+        ToolSubst(
+            '%platformserver',
         'lldb-test',
         'lldb-instr',
-        ToolSubst('%build',
-                  command="'" + sys.executable + "'",
-                  extra_args=build_script_args)
-        ]
+        ToolSubst(
+            '%build',
 
     llvm_config.add_tool_substitutions(primary_tools,
                                        [config.lldb_tools_dir])
     # lldb-mi always fails without Python support
     if lldbmi.was_resolved and not config.lldb_disable_python:
         config.available_features.add('lldb-mi')
 
 def _use_msvc_substitutions(config):