This revision was automatically updated to reflect the committed changes.
Closed by commit rL255584: Make few adjustments after r255542. (authored by
sivachandra).
Changed prior to commit:
http://reviews.llvm.org/D15511?vs=42796&id=42802#toc
Repository:
rL LLVM
http://reviews.llvm.org/D15511
Files:
lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
Index: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
@@ -619,10 +619,10 @@
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
Index: lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
===================================================================
--- lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
+++ lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py
@@ -619,10 +619,10 @@
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
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
