summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test/lldbtest.py
diff options
context:
space:
mode:
authorSiva Chandra <sivachandra@google.com>2015-12-15 00:26:52 +0000
committerSiva Chandra <sivachandra@google.com>2015-12-15 00:26:52 +0000
commita386358c3697676d4fea4dd80fd6057793284c64 (patch)
treeea434b340bb0fe2e5d86da596493d3c2c151716c /lldb/packages/Python/lldbsuite/test/lldbtest.py
parent25b43f3624087cede9aabf3f7afd0c1be613e387 (diff)
downloadbcm5719-llvm-a386358c3697676d4fea4dd80fd6057793284c64.tar.gz
bcm5719-llvm-a386358c3697676d4fea4dd80fd6057793284c64.zip
Make few adjustments after r255542.
Reviewers: zturner Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D15511 llvm-svn: 255584
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/lldbtest.py')
-rw-r--r--lldb/packages/Python/lldbsuite/test/lldbtest.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index c8b600bc2e2..51e11a7ca9c 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -619,10 +619,10 @@ def not_in(iterable):
def check_list_or_lambda(list_or_lambda, value):
if six.callable(list_or_lambda):
return list_or_lambda(value)
- elif isinstance(list_or_lambda, list):
- return list_or_lambda is None or value is None or value in list_or_lambda
+ elif isinstance(list_or_lambda, list) or isinstance(list_or_lambda, str):
+ return value is None or value in list_or_lambda
else:
- return list_or_lambda == value
+ return list_or_lambda is None or value is None or list_or_lambda == value
# provide a function to xfail on defined oslist, compiler version, and archs
# if none is specified for any argument, that argument won't be checked and thus means for all
OpenPOWER on IntegriCloud