summaryrefslogtreecommitdiffstats
path: root/lldb/packages/Python/lldbsuite/test
diff options
context:
space:
mode:
authorAdrian McCarthy <amccarth@google.com>2015-11-20 00:11:38 +0000
committerAdrian McCarthy <amccarth@google.com>2015-11-20 00:11:38 +0000
commit257da8ea5046e2e78a5e3e030d31eebeb9ec8106 (patch)
treebdeb6ae6d0aff8def970b4429f60e50cc117e1ee /lldb/packages/Python/lldbsuite/test
parent4d45090659f669f91de8aef88f67d790d86a5fe0 (diff)
downloadbcm5719-llvm-257da8ea5046e2e78a5e3e030d31eebeb9ec8106.tar.gz
bcm5719-llvm-257da8ea5046e2e78a5e3e030d31eebeb9ec8106.zip
Make skipIf support the not_in function.
llvm-svn: 253623
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
-rw-r--r--lldb/packages/Python/lldbsuite/test/lldbtest.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/lldb/packages/Python/lldbsuite/test/lldbtest.py b/lldb/packages/Python/lldbsuite/test/lldbtest.py
index 2301616bbfc..ac3b39d57fb 100644
--- a/lldb/packages/Python/lldbsuite/test/lldbtest.py
+++ b/lldb/packages/Python/lldbsuite/test/lldbtest.py
@@ -1100,10 +1100,10 @@ def skipIfLinuxClang(func):
# TODO: refactor current code, to make skipIfxxx functions to call this function
def skipIf(bugnumber=None, oslist=None, compiler=None, compiler_version=None, archs=None, debug_info=None, swig_version=None, py_version=None):
def fn(self):
- oslist_passes = oslist is None or self.getPlatform() in oslist
- compiler_passes = compiler is None or (compiler in self.getCompiler() and self.expectedCompilerVersion(compiler_version))
+ oslist_passes = check_list_or_lambda(oslist, self.getPlatform())
+ compiler_passes = check_list_or_lambda(compiler, self.getCompiler()) and self.expectedCompilerVersion(compiler_version)
arch_passes = self.expectedArch(archs)
- debug_info_passes = debug_info is None or self.debug_info in debug_info
+ debug_info_passes = check_list_or_lambda(debug_info, self.debug_info)
swig_version_passes = (swig_version is None) or (not hasattr(lldb, 'swig_version')) or (check_expected_version(swig_version[0], swig_version[1], lldb.swig_version))
py_version_passes = (py_version is None) or check_expected_version(py_version[0], py_version[1], sys.version_info)
OpenPOWER on IntegriCloud