[PATCH] D63679: [lit] Make lit-lldb-init configurable by CMake

[Jonas Devlieghere via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL364112: [lit] Make lit-lldb-init configurable by CMake (authored by JDevlieghere, committed by ).
Herald added a project: LLVM.
Herald added a subscriber: llvm-commits.

Changed prior to commit:
  https://reviews.llvm.org/D63679?vs=206095&id=206096#toc

Repository:
  rL LLVM

CHANGES SINCE LAST ACTION
  https://reviews.llvm.org/D63679/new/

https://reviews.llvm.org/D63679

Files:
  lldb/trunk/lit/CMakeLists.txt
  lldb/trunk/lit/helper/toolchain.py
  lldb/trunk/lit/lit-lldb-init
  lldb/trunk/lit/lit-lldb-init.in


Index: lldb/trunk/lit/CMakeLists.txt
===================================================================
--- lldb/trunk/lit/CMakeLists.txt
+++ lldb/trunk/lit/CMakeLists.txt
@@ -81,6 +81,10 @@
   ${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
Index: lldb/trunk/lit/lit-lldb-init.in
===================================================================
--- lldb/trunk/lit/lit-lldb-init.in
+++ lldb/trunk/lit/lit-lldb-init.in
@@ -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
Index: lldb/trunk/lit/helper/toolchain.py
===================================================================
--- lldb/trunk/lit/helper/toolchain.py
+++ lldb/trunk/lit/helper/toolchain.py
@@ -38,12 +38,12 @@
         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',
Index: lldb/trunk/lit/lit-lldb-init
===================================================================
--- lldb/trunk/lit/lit-lldb-init
+++ lldb/trunk/lit/lit-lldb-init
@@ -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


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D63679.206096.patch
Type: text/x-patch
Size: 2054 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190621/03f235f7/attachment.bin>