Make few adjustments after r255542.

[sivachandra]

I went ahead and committed this.

[tfiala]

Yep this fixed the issues I was having on OS X with the related change. Thanks, Siva!

[zturner]

lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py

622

I mentioned this in the other thread, but I'm not sure we want the string check. if list_or_lambda is a string, then I think it should just check list_or_lambda == value. Otherwise the test only passes when value is a character, which is not now we use any of the decorators.

lldb/trunk/packages/Python/lldbsuite/test/lldbtest.py

 # are simple lists, namely oslist, compiler, and debug_info.
 
 def not_in(iterable):
     return lambda x : x 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
 # for example,
 # @expectedFailureAll, xfail for all platform/compiler/arch,
 # @expectedFailureAll(compiler='gcc'), xfail for gcc on all platform/architecture
 # @expectedFailureAll(bugnumber, ["linux"], "gcc", ['>=', '4.9'], ['i386']), xfail for gcc>=4.9 on linux with i386
 def expectedFailureAll(bugnumber=None, oslist=None, hostoslist=None, compiler=None, compiler_version=None, archs=None, triple=None, debug_info=None, swig_version=None, py_version=None):