diff options
| author | Siva Chandra <sivachandra@google.com> | 2015-11-20 01:54:24 +0000 |
|---|---|---|
| committer | Siva Chandra <sivachandra@google.com> | 2015-11-20 01:54:24 +0000 |
| commit | d2e90129d9743865cab52d331111cfb563f4f772 (patch) | |
| tree | fe64e018800f87c81cc61170897ed0cea9ffff83 /lldb/packages/Python/lldbsuite/test | |
| parent | c7315b3ebfaca4e0ea234a8dd3e4194c44c92cbf (diff) | |
| download | bcm5719-llvm-d2e90129d9743865cab52d331111cfb563f4f772.tar.gz bcm5719-llvm-d2e90129d9743865cab52d331111cfb563f4f772.zip | |
Revert "Make skipIf support the not_in function."
Summary:
This reverts commit 251965377bdfb6227eea42c12a792c059e4e8a4b
as a test marked "skipIf(compiler='gcc')" runs when testing with GCC.
Reviewers: amccarth
Subscribers: lldb-commits
Differential Revision: http://reviews.llvm.org/D14852
llvm-svn: 253631
Diffstat (limited to 'lldb/packages/Python/lldbsuite/test')
| -rw-r--r-- | lldb/packages/Python/lldbsuite/test/lldbtest.py | 6 |
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 ac3b39d57fb..2301616bbfc 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 = check_list_or_lambda(oslist, self.getPlatform()) - compiler_passes = check_list_or_lambda(compiler, self.getCompiler()) and self.expectedCompilerVersion(compiler_version) + 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)) arch_passes = self.expectedArch(archs) - debug_info_passes = check_list_or_lambda(debug_info, self.debug_info) + debug_info_passes = debug_info is None or self.debug_info in 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) |
