maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[lldb/test] Support git commit version ids for clang. 

`getCompilerVersion` assumes that `clang --version` prints out a string like `version [0-9\.]+`.
If clang is built from trunk, the version line might look like `clang version trunk (123abc)`.

Since there isn't any way of knowing by the commit id alone whether one commit is newer or older than another git commit (or clang version), assume that clang with a version id like this is very close to trunk. For example, any tests with `@skipIf(compiler="clang", compiler_version=['<', '8'])` should be run.

Reviewed By: MaskRay

Differential Revision: https://reviews.llvm.org/D85248
This commit is contained in:
Jordan Rupprecht 2020-08-05 13:16:01 -07:00
parent 7d057efddc
commit 1dbac09dd6
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lldb/packages/Python/lldbsuite/test/lldbtest.py
View File

@ -1325,25 +1325,35 @@ class Base(unittest2.TestCase):
Use compiler_version[0] to specify the operator used to determine if a match has occurred.
Any operator other than the following defaults to an equality test:
'>', '>=', "=>", '<', '<=', '=<', '!=', "!" or 'not'
If the current compiler version cannot be determined, we assume it is close to the top
of trunk, so any less-than or equal-to comparisons will return False, and any
greater-than or not-equal-to comparisons will return True.
"""
if (compiler_version is None):
if compiler_version is None:
return True
operator = str(compiler_version[0])
version = compiler_version[1]
if (version is None):
if version is None:
return True
if (operator == '>'):
return LooseVersion(self.getCompilerVersion()) > LooseVersion(version)
if (operator == '>=' or operator == '=>'):
return LooseVersion(self.getCompilerVersion()) >= LooseVersion(version)
if (operator == '<'):
return LooseVersion(self.getCompilerVersion()) < LooseVersion(version)
if (operator == '<=' or operator == '=<'):
return LooseVersion(self.getCompilerVersion()) <= LooseVersion(version)
if (operator == '!=' or operator == '!' or operator == 'not'):
return str(version) not in str(self.getCompilerVersion())
return str(version) in str(self.getCompilerVersion())
test_compiler_version = self.getCompilerVersion()
if test_compiler_version == 'unknown':
# Assume the compiler version is at or near the top of trunk.
return operator in ['>', '>=', '!', '!=', 'not']
if operator == '>':
return LooseVersion(test_compiler_version) > LooseVersion(version)
if operator == '>=' or operator == '=>':
return LooseVersion(test_compiler_version) >= LooseVersion(version)
if operator == '<':
return LooseVersion(test_compiler_version) < LooseVersion(version)
if operator == '<=' or operator == '=<':
return LooseVersion(test_compiler_version) <= LooseVersion(version)
if operator == '!=' or operator == '!' or operator == 'not':
return str(version) not in str(test_compiler_version)
return str(version) in str(test_compiler_version)
def expectedCompiler(self, compilers):
"""Returns True iff any element of compilers is a sub-string of the current compiler."""