[llvm-branch-commits] [lldb] r362016 - Merging r353700:

[Tom Stellard via llvm-branch-commits]

Author: tstellar
Date: Wed May 29 12:26:53 2019
New Revision: 362016

URL: http://llvm.org/viewvc/llvm-project?rev=362016&view=rev
Log:
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
------------------------------------------------------------------------

Added:
    lldb/branches/release_80/lit/tools/lldb-mi/lit.local.cfg
Modified:
    lldb/branches/release_80/lit/helper/toolchain.py
    lldb/branches/release_80/lit/lit.site.cfg.py.in

Modified: lldb/branches/release_80/lit/helper/toolchain.py
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_80/lit/helper/toolchain.py?rev=362016&r1=362015&r2=362016&view=diff
==============================================================================
--- lldb/branches/release_80/lit/helper/toolchain.py (original)
+++ lldb/branches/release_80/lit/helper/toolchain.py Wed May 29 12:26:53 2019
@@ -51,7 +51,8 @@ def use_lldb_substitutions(config):
 
     llvm_config.add_tool_substitutions(primary_tools,
                                        [config.lldb_tools_dir])
-    if lldbmi.was_resolved:
+    # lldb-mi always fails without Python support
+    if lldbmi.was_resolved and not config.lldb_disable_python:
         config.available_features.add('lldb-mi')
 
 def _use_msvc_substitutions(config):

Modified: lldb/branches/release_80/lit/lit.site.cfg.py.in
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_80/lit/lit.site.cfg.py.in?rev=362016&r1=362015&r2=362016&view=diff
==============================================================================
--- lldb/branches/release_80/lit/lit.site.cfg.py.in (original)
+++ lldb/branches/release_80/lit/lit.site.cfg.py.in Wed May 29 12:26:53 2019
@@ -17,6 +17,7 @@ config.python_executable = "@PYTHON_EXEC
 config.have_zlib = @LLVM_ENABLE_ZLIB@
 config.host_triple = "@LLVM_HOST_TRIPLE@"
 config.lldb_bitness = 64 if @LLDB_IS_64_BITS@ else 32
+config.lldb_disable_python = @LLDB_DISABLE_PYTHON@
 
 # Support substitution of the tools and libs dirs with user parameters. This is
 # used when we can't determine the tool dir at configuration time.

Added: lldb/branches/release_80/lit/tools/lldb-mi/lit.local.cfg
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_80/lit/tools/lldb-mi/lit.local.cfg?rev=362016&view=auto
==============================================================================
--- lldb/branches/release_80/lit/tools/lldb-mi/lit.local.cfg (added)
+++ lldb/branches/release_80/lit/tools/lldb-mi/lit.local.cfg Wed May 29 12:26:53 2019
@@ -0,0 +1,2 @@
+if not "lldb-mi" in config.available_features:
+    config.unsupported = True