diff options
author | Tom Stellard <tstellar@redhat.com> | 2019-06-25 00:14:16 +0000 |
---|---|---|
committer | Tom Stellard <tstellar@redhat.com> | 2019-06-25 00:14:16 +0000 |
commit | cc6efaea3df3aa11a1d4d2c03c69784a5c702977 (patch) | |
tree | e22060a3b811552ddfbb8d567b759ab6ae876e68 | |
parent | 19652cc5f5095c9faa3cadde70b07297fae754ae (diff) |
Merging r361114:release_80
------------------------------------------------------------------------
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
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/lldb/branches/release_80@364257 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | lit/Driver/TestConvenienceVariables.test | 3 | ||||
-rw-r--r-- | lit/lit.cfg.py | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lit/Driver/TestConvenienceVariables.test b/lit/Driver/TestConvenienceVariables.test index 99536e4c0..a7b6faa34 100644 --- a/lit/Driver/TestConvenienceVariables.test +++ b/lit/Driver/TestConvenienceVariables.test @@ -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 diff --git a/lit/lit.cfg.py b/lit/lit.cfg.py index e1db7621e..ff4e60e5b 100644 --- a/lit/lit.cfg.py +++ b/lit/lit.cfg.py @@ -73,3 +73,6 @@ for i in ['module-cache-clang', 'module-cache-lldb']: 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') |