Author: jdevlieghere Date: Fri Jun 21 16:12:22 2019 New Revision: 364112 URL: http://llvm.org/viewvc/llvm-project?rev=364112&view=rev Log: [lit] Make lit-lldb-init configurable by CMake
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. Differential revision: https://reviews.llvm.org/D63679 Added: lldb/trunk/lit/lit-lldb-init.in Removed: lldb/trunk/lit/lit-lldb-init Modified: lldb/trunk/lit/CMakeLists.txt lldb/trunk/lit/helper/toolchain.py Modified: lldb/trunk/lit/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/CMakeLists.txt?rev=364112&r1=364111&r2=364112&view=diff ============================================================================== --- lldb/trunk/lit/CMakeLists.txt (original) +++ lldb/trunk/lit/CMakeLists.txt Fri Jun 21 16:12:22 2019 @@ -81,6 +81,10 @@ 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 Modified: lldb/trunk/lit/helper/toolchain.py URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/helper/toolchain.py?rev=364112&r1=364111&r2=364112&view=diff ============================================================================== --- lldb/trunk/lit/helper/toolchain.py (original) +++ lldb/trunk/lit/helper/toolchain.py Fri Jun 21 16:12:22 2019 @@ -38,12 +38,12 @@ def use_lldb_substitutions(config): ToolSubst('%lldb', command=FindTool('lldb'), extra_args=['--no-lldbinit', '-S', - os.path.join(config.test_source_root, + os.path.join(config.test_exec_root, 'lit-lldb-init')]), ToolSubst('%lldb-init', command=FindTool('lldb'), extra_args=['-S', - os.path.join(config.test_source_root, + os.path.join(config.test_exec_root, 'lit-lldb-init')]), lldbmi, ToolSubst('%debugserver', Removed: lldb/trunk/lit/lit-lldb-init URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/lit-lldb-init?rev=364111&view=auto ============================================================================== --- lldb/trunk/lit/lit-lldb-init (original) +++ lldb/trunk/lit/lit-lldb-init (removed) @@ -1,3 +0,0 @@ -# LLDB init file for the LIT tests. -settings set symbols.enable-external-lookup false -settings set interpreter.echo-comment-commands false Added: lldb/trunk/lit/lit-lldb-init.in URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/lit-lldb-init.in?rev=364112&view=auto ============================================================================== --- lldb/trunk/lit/lit-lldb-init.in (added) +++ lldb/trunk/lit/lit-lldb-init.in Fri Jun 21 16:12:22 2019 @@ -0,0 +1,3 @@ +# LLDB init file for the LIT tests. +settings set symbols.enable-external-lookup false +settings set interpreter.echo-comment-commands false _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
