Index: vendor/lldb/dist-release_80/lit/Driver/TestConvenienceVariables.test =================================================================== --- vendor/lldb/dist-release_80/lit/Driver/TestConvenienceVariables.test (revision 349786) +++ vendor/lldb/dist-release_80/lit/Driver/TestConvenienceVariables.test (revision 349787) @@ -1,22 +1,23 @@ +REQUIRES: python RUN: %build %p/Inputs/hello.cpp -o %t RUN: %lldb %t -s %p/Inputs/convenience.in -o quit | FileCheck %s script print(lldb.debugger) CHECK: stop reason = breakpoint 1.1 CHECK: Debugger (instance: {{.*}}, id: {{[0-9]+}}) CHECK: script print(lldb.target) CHECK: TestConvenienceVariables.test CHECK: script print(lldb.process) CHECK: SBProcess: pid = {{[0-9]+}}, CHECK-SAME: state = stopped, CHECK-SAME: threads = {{[0-9]+}}, CHECK-SAME: executable = TestConvenienceVariables.test CHECK: script print(lldb.thread.GetStopDescription(100)) CHECK: breakpoint 1.1 CHECK: script lldb.frame.GetLineEntry().GetLine() CHECK: 8 CHECK: script lldb.frame.GetLineEntry().GetFileSpec().GetFilename() CHECK: hello.c CHECK: script lldb.frame.GetFunctionName() -CHECK: main \ No newline at end of file +CHECK: main Index: vendor/lldb/dist-release_80/lit/lit.cfg.py =================================================================== --- vendor/lldb/dist-release_80/lit/lit.cfg.py (revision 349786) +++ vendor/lldb/dist-release_80/lit/lit.cfg.py (revision 349787) @@ -1,75 +1,78 @@ # -*- Python -*- import os import re import shutil import site import sys import lit.formats from lit.llvm import llvm_config from lit.llvm.subst import FindTool from lit.llvm.subst import ToolSubst site.addsitedir(os.path.dirname(__file__)) from helper import toolchain # name: The name of this test suite. config.name = 'LLDB' # testFormat: The test format to use to interpret tests. config.test_format = lit.formats.ShTest(not llvm_config.use_lit_shell) # suffixes: A list of file extensions to treat as test files. This is overriden # by individual lit.local.cfg files in the test subdirectories. config.suffixes = ['.test', '.cpp', '.s'] # excludes: A list of directories to exclude from the testsuite. The 'Inputs' # subdirectories contain auxiliary inputs for various tests in their parent # directories. config.excludes = ['Inputs', 'CMakeLists.txt', 'README.txt', 'LICENSE.txt'] # test_source_root: The root path where tests are located. config.test_source_root = os.path.dirname(__file__) # test_exec_root: The root path where tests should be run. config.test_exec_root = os.path.join(config.lldb_obj_root, 'lit') llvm_config.use_default_substitutions() toolchain.use_lldb_substitutions(config) toolchain.use_support_substitutions(config) if re.match(r'^arm(hf.*-linux)|(.*-linux-gnuabihf)', config.target_triple): config.available_features.add("armhf-linux") def calculate_arch_features(arch_string): # This will add a feature such as x86, arm, mips, etc for each built # target features = [] for arch in arch_string.split(): features.append(arch.lower()) return features # Run llvm-config and add automatically add features for whether we have # assertions enabled, whether we are in debug mode, and what targets we # are built for. llvm_config.feature_config( [('--assertion-mode', {'ON': 'asserts'}), ('--build-mode', {'DEBUG': 'debug'}), ('--targets-built', calculate_arch_features) ]) # Clean the module caches in the test build directory. This is # necessary in an incremental build whenever clang changes underneath, # so doing it once per lit.py invocation is close enough. for i in ['module-cache-clang', 'module-cache-lldb']: cachedir = os.path.join(config.lldb_libs_dir, '..', 'lldb-test-build.noindex', i) if os.path.isdir(cachedir): print("Deleting module cache at %s."%cachedir) shutil.rmtree(cachedir) + +if not config.lldb_disable_python: + config.available_features.add('python')