[Lldb-commits] [lldb] r364113 - [lit] Deduplicate logic in toolchain.py

[Jonas Devlieghere via lldb-commits]

Author: jdevlieghere
Date: Fri Jun 21 16:12:25 2019
New Revision: 364113

URL: http://llvm.org/viewvc/llvm-project?rev=364113&view=rev
Log:
[lit] Deduplicate logic in toolchain.py

No need to compute the path of lit-lldb-init twice.

Modified:
    lldb/trunk/lit/helper/toolchain.py

Modified: lldb/trunk/lit/helper/toolchain.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/helper/toolchain.py?rev=364113&r1=364112&r2=364113&view=diff
==============================================================================
--- lldb/trunk/lit/helper/toolchain.py (original)
+++ lldb/trunk/lit/helper/toolchain.py Fri Jun 21 16:12:25 2019
@@ -34,17 +34,15 @@ def use_lldb_substitutions(config):
     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_exec_root,
-                                           'lit-lldb-init')]),
+                  extra_args=['--no-lldbinit', '-S', lldb_init]),
         ToolSubst('%lldb-init',
                   command=FindTool('lldb'),
-                  extra_args=['-S',
-                              os.path.join(config.test_exec_root,
-                                           'lit-lldb-init')]),
+                  extra_args=['-S', lldb_init]),
         lldbmi,
         ToolSubst('%debugserver',
                   command=FindTool(dsname),