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

[Jonas Devlieghere via Phabricator via lldb-commits]

JDevlieghere updated this revision to Diff 206095.
JDevlieghere added a comment.

Undo reformatting


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

https://reviews.llvm.org/D63679

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


Index: lldb/lit/helper/toolchain.py
===================================================================
--- lldb/lit/helper/toolchain.py
+++ lldb/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/lit/CMakeLists.txt
===================================================================
--- lldb/lit/CMakeLists.txt
+++ lldb/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/lit/helper/toolchain.py
===================================================================
--- lldb/lit/helper/toolchain.py
+++ lldb/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/lit/CMakeLists.txt
===================================================================
--- lldb/lit/CMakeLists.txt
+++ lldb/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

_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits