From a386358c3697676d4fea4dd80fd6057793284c64 Mon Sep 17 00:00:00 2001 From: Siva Chandra Date: Tue, 15 Dec 2015 00:26:52 +0000 Subject: Make few adjustments after r255542. Reviewers: zturner Subscribers: lldb-commits Differential Revision: http://reviews.llvm.org/D15511 llvm-svn: 255584 --- lldb/packages/Python/lldbsuite/test/lldbtest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lldb/packages/Python/lldbsuite/test/lldbtest.py') 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 -- cgit v1.2.3