summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Stellard <tstellar@redhat.com>2019-06-25 00:14:16 +0000
committerTom Stellard <tstellar@redhat.com>2019-06-25 00:14:16 +0000
commitd37559239de81b23fdad253669e43185f9a71195 (patch)
tree3fb042b2fc756088e7738c19d2362305b7ef0990
parent464c365c0f73daf7af495a383312ed066e4a386e (diff)
downloadllvm-d37559239de81b23fdad253669e43185f9a71195.tar.gz
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 ------------------------------------------------------------------------ llvm-svn: 364257
-rw-r--r--lldb/lit/Driver/TestConvenienceVariables.test3
-rw-r--r--lldb/lit/lit.cfg.py3
2 files changed, 5 insertions, 1 deletions
diff --git a/lldb/lit/Driver/TestConvenienceVariables.test b/lldb/lit/Driver/TestConvenienceVariables.test
index 99536e4c0290..a7b6faa34cb3 100644
--- a/lldb/lit/Driver/TestConvenienceVariables.test
+++ b/lldb/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/lldb/lit/lit.cfg.py b/lldb/lit/lit.cfg.py
index e1db7621e328..ff4e60e5b4bd 100644
--- a/lldb/lit/lit.cfg.py
+++ b/lldb/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')