Skip to content

Commit d446349

Browse files
committed
Merging r353700:
------------------------------------------------------------------------ r353700 | mgorny | 2019-02-11 06:09:43 -0800 (Mon, 11 Feb 2019) | 7 lines [lldb] [test] Skip lldb-mi test if LLDB_DISABLE_PYTHON is used Skip running lldb-mi tests when Python support is disabled. This causes lldb-mi to unconditionally fail, and therefore all the relevant tests fail as well. Differential Revision: https://reviews.llvm.org/D58000 ------------------------------------------------------------------------ llvm-svn: 362016
1 parent c743d72 commit d446349

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

lldb/lit/helper/toolchain.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@ def use_lldb_substitutions(config):
5151

5252
llvm_config.add_tool_substitutions(primary_tools,
5353
[config.lldb_tools_dir])
54-
if lldbmi.was_resolved:
54+
# lldb-mi always fails without Python support
55+
if lldbmi.was_resolved and not config.lldb_disable_python:
5556
config.available_features.add('lldb-mi')
5657

5758
def _use_msvc_substitutions(config):

lldb/lit/lit.site.cfg.py.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ config.python_executable = "@PYTHON_EXECUTABLE@"
1717
config.have_zlib = @LLVM_ENABLE_ZLIB@
1818
config.host_triple = "@LLVM_HOST_TRIPLE@"
1919
config.lldb_bitness = 64 if @LLDB_IS_64_BITS@ else 32
20+
config.lldb_disable_python = @LLDB_DISABLE_PYTHON@
2021

2122
# Support substitution of the tools and libs dirs with user parameters. This is
2223
# used when we can't determine the tool dir at configuration time.
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
if not "lldb-mi" in config.available_features:
2+
config.unsupported = True

0 commit comments

Comments
 (0)