summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python
diff options
context:
space:
mode:
Diffstat (limited to 'lldb/packages/Python')
-rw-r--r--lldb/packages/Python/lldbsuite/test/decorators.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/decorators.py b/lldb/packages/Python/lldbsuite/test/decorators.py
index 6ec74fb7069..4248c461c88 100644
--- a/lldb/packages/Python/lldbsuite/test/decorators.py
+++ b/lldb/packages/Python/lldbsuite/test/decorators.py
@@ -4,6 +4,7 @@ from __future__ import print_function
# System modules
from distutils.version import LooseVersion, StrictVersion
from functools import wraps
+import inspect
import os
import platform
import re
@@ -305,7 +306,11 @@ def add_test_categories(cat):
"@add_test_categories can only be used to decorate a test method")
if hasattr(func, "categories"):
cat.extend(func.categories)
- func.categories = cat
+ # For instance methods, the attribute must be set on the actual function.
+ if inspect.ismethod(func):
+ func.__func__.categories = cat
+ else:
+ func.categories = cat
return func
return impl
@@ -518,7 +523,7 @@ def skipIfNoSBHeaders(func):
'LLDB.h')
if os.path.exists(header):
return None
-
+
header = os.path.join(
os.environ["LLDB_SRC"],
"include",
OpenPOWER on IntegriCloud