[Lldb-commits] [lldb] r334080 - [lit] Do not run Python tests w/ LLDB_DISABLE_PYTHON

[Michal Gorny via lldb-commits]

Author: mgorny
Date: Wed Jun  6 02:44:14 2018
New Revision: 334080

URL: http://llvm.org/viewvc/llvm-project?rev=334080&view=rev
Log:
[lit] Do not run Python tests w/ LLDB_DISABLE_PYTHON

Skip all Python-based tests as unsupported when LLDB_DISABLE_PYTHON is
enabled.  Otherwise, those tests simply fail being unable to import lldb
module.

Differential Revision: https://reviews.llvm.org/D47812

Modified:
    lldb/trunk/lit/CMakeLists.txt
    lldb/trunk/lit/Suite/lit.site.cfg.in
    lldb/trunk/lit/Suite/lldbtest.py

Modified: lldb/trunk/lit/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/CMakeLists.txt?rev=334080&r1=334079&r2=334080&view=diff
==============================================================================
--- lldb/trunk/lit/CMakeLists.txt (original)
+++ lldb/trunk/lit/CMakeLists.txt Wed Jun  6 02:44:14 2018
@@ -46,6 +46,7 @@ endif(BUILD_SHARED_LIBS)
 
 # the value is not canonicalized within LLVM
 llvm_canonicalize_cmake_booleans(
+  LLDB_DISABLE_PYTHON
   LLVM_ENABLE_ZLIB)
 
 configure_lit_site_cfg(

Modified: lldb/trunk/lit/Suite/lit.site.cfg.in
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Suite/lit.site.cfg.in?rev=334080&r1=334079&r2=334080&view=diff
==============================================================================
--- lldb/trunk/lit/Suite/lit.site.cfg.in (original)
+++ lldb/trunk/lit/Suite/lit.site.cfg.in Wed Jun  6 02:44:14 2018
@@ -13,6 +13,7 @@ config.target_triple = "@TARGET_TRIPLE@"
 config.python_executable = "@PYTHON_EXECUTABLE@"
 config.dotest_path = "@LLDB_SOURCE_DIR@/test/dotest.py"
 config.dotest_args_str = "@LLDB_DOTEST_ARGS@"
+config.lldb_disable_python = @LLDB_DISABLE_PYTHON@
 
 
 # Additional dotest arguments can be passed to lit by providing a

Modified: lldb/trunk/lit/Suite/lldbtest.py
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lit/Suite/lldbtest.py?rev=334080&r1=334079&r2=334080&view=diff
==============================================================================
--- lldb/trunk/lit/Suite/lldbtest.py (original)
+++ lldb/trunk/lit/Suite/lldbtest.py Wed Jun  6 02:44:14 2018
@@ -37,6 +37,9 @@ class LLDBTest(TestFormat):
         if litConfig.noExecute:
             return lit.Test.PASS, ''
 
+        if test.config.lldb_disable_python:
+            return (lit.Test.UNSUPPORTED, 'Python module disabled')
+
         if test.config.unsupported:
             return (lit.Test.UNSUPPORTED, 'Test is unsupported')