[Lldb-commits] [lldb] 911a4c4 - [lldb/Test] Fix API tests for mutli-config generators

[Jonas Devlieghere via lldb-commits]

Author: Jonas Devlieghere
Date: 2020-01-16T22:25:55-08:00
New Revision: 911a4c4dda9b3e50d4b610d50cc6368433a67684

URL: https://github.com/llvm/llvm-project/commit/911a4c4dda9b3e50d4b610d50cc6368433a67684
DIFF: https://github.com/llvm/llvm-project/commit/911a4c4dda9b3e50d4b610d50cc6368433a67684.diff

LOG: [lldb/Test] Fix API tests for mutli-config generators

The build configuration wasn't properly substituted for the
config.lldb_executable variable. This broke when the variable was
extracted from config.dotest_args_str which was properly substituted.

Added: 
    

Modified: 
    lldb/test/API/lit.site.cfg.py.in

Removed: 
    


################################################################################
diff  --git a/lldb/test/API/lit.site.cfg.py.in b/lldb/test/API/lit.site.cfg.py.in
index d7e2764f672e..a675c978750c 100644
--- a/lldb/test/API/lit.site.cfg.py.in
+++ b/lldb/test/API/lit.site.cfg.py.in
@@ -42,8 +42,10 @@ if dotest_lit_args_str:
 try:
     config.llvm_tools_dir = config.llvm_tools_dir % lit_config.params
     config.llvm_libs_dir = config.llvm_libs_dir % lit_config.params
-    config.dotest_args_str = config.dotest_args_str % lit_config.params
+    config.llvm_shlib_dir = config.llvm_shlib_dir % lit_config.params
     config.llvm_build_mode = config.llvm_build_mode % lit_config.params
+    config.lldb_executable = config.lldb_executable % lit_config.params
+    config.dotest_args_str = config.dotest_args_str % lit_config.params
 except KeyError as e:
     key, = e.args
     lit_config.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))