diff options
author | Enrico Granata <egranata@apple.com> | 2015-12-04 19:50:05 +0000 |
---|---|---|
committer | Enrico Granata <egranata@apple.com> | 2015-12-04 19:50:05 +0000 |
commit | ef4fa44ab86b8bb84b579f0fea37c014b3d00df1 (patch) | |
tree | c7a9a63ffcfc9d2f2922b9d593b2ec54f6aa3fdc /lldb/packages/Python/lldbsuite/test/lldbutil.py | |
parent | 367e2fe123bd62920740ec7536f1801a93868e77 (diff) | |
download | bcm5719-llvm-ef4fa44ab86b8bb84b579f0fea37c014b3d00df1.tar.gz bcm5719-llvm-ef4fa44ab86b8bb84b579f0fea37c014b3d00df1.zip |
Fix an issue where all tests marked with skip_if_callable would be skipped regardless of the actual callable
llvm-svn: 254758
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test/lldbutil.py')
-rw-r--r-- | lldb/packages/Python/lldbsuite/test/lldbutil.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbutil.py b/lldb/packages/Python/lldbsuite/test/lldbutil.py index 5521b80200f..6b242564ff0 100644 --- a/lldb/packages/Python/lldbsuite/test/lldbutil.py +++ b/lldb/packages/Python/lldbsuite/test/lldbutil.py @@ -985,10 +985,11 @@ class PrintableRegex(object): def __repr__(self): return "re.compile(%s) -> %s" % (self.text, self.regex) -def skip_if_callable(test, callable, reason): - if six.callable(test): - test.skipTest(reason) - return True +def skip_if_callable(test, mycallable, reason): + if six.callable(mycallable): + if mycallable(test): + test.skipTest(reason) + return True return False def skip_if_library_missing(test, target, library): |