Author: tstellar Date: Mon Jun 24 17:14:16 2019 New Revision: 364257 URL: http://llvm.org/viewvc/llvm-project?rev=364257&view=rev Log: Merging r361114:
------------------------------------------------------------------------ r361114 | mgorny | 2019-05-18 23:05:31 -0700 (Sat, 18 May 2019) | 3 lines [lldb] [lit] Driver/TestConvenienceVariables.test requires Python Differential Revision: https://reviews.llvm.org/D62096 ------------------------------------------------------------------------ Modified: lldb/branches/release_80/lit/Driver/TestConvenienceVariables.test lldb/branches/release_80/lit/lit.cfg.py Modified: lldb/branches/release_80/lit/Driver/TestConvenienceVariables.test URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_80/lit/Driver/TestConvenienceVariables.test?rev=364257&r1=364256&r2=364257&view=diff ============================================================================== --- lldb/branches/release_80/lit/Driver/TestConvenienceVariables.test (original) +++ lldb/branches/release_80/lit/Driver/TestConvenienceVariables.test Mon Jun 24 17:14:16 2019 @@ -1,3 +1,4 @@ +REQUIRES: python RUN: %build %p/Inputs/hello.cpp -o %t RUN: %lldb %t -s %p/Inputs/convenience.in -o quit | FileCheck %s @@ -19,4 +20,4 @@ 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 Modified: lldb/branches/release_80/lit/lit.cfg.py URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_80/lit/lit.cfg.py?rev=364257&r1=364256&r2=364257&view=diff ============================================================================== --- lldb/branches/release_80/lit/lit.cfg.py (original) +++ lldb/branches/release_80/lit/lit.cfg.py Mon Jun 24 17:14:16 2019 @@ -73,3 +73,6 @@ for i in ['module-cache-clang', 'module- 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') _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
