diff options
author | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-06-25 21:00:58 -0400 |
---|---|---|
committer | Michael Hirsch, Ph.D <scivision@users.noreply.github.com> | 2019-07-08 22:27:35 -0400 |
commit | c756d06fbb54651c2ba19f7801885018c1c389df (patch) | |
tree | 8b211268b057550a2b2d78f000c161700af53e22 /mesonbuild/mesonlib.py | |
parent | fb4c95a32207e3ec0f7f18a3956da34d45b029a4 (diff) | |
download | meson-c756d06fbb54651c2ba19f7801885018c1c389df.zip meson-c756d06fbb54651c2ba19f7801885018c1c389df.tar.gz meson-c756d06fbb54651c2ba19f7801885018c1c389df.tar.bz2 |
add clang c_std=c18 alias
fix unit test skips for clang c18
correct unittests clang minimum version
cleanup unittest clang skip c_std
finesse unittest vs. clang version
Diffstat (limited to 'mesonbuild/mesonlib.py')
-rw-r--r-- | mesonbuild/mesonlib.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py index d052a2b..485a0e1 100644 --- a/mesonbuild/mesonlib.py +++ b/mesonbuild/mesonlib.py @@ -574,7 +574,7 @@ class Version: # otherwise, the version with a suffix remaining is greater return comparator(len(self._v), len(other._v)) -def _version_extract_cmpop(vstr2): +def _version_extract_cmpop(vstr2: str) -> tuple: if vstr2.startswith('>='): cmpop = operator.ge vstr2 = vstr2[2:] @@ -601,7 +601,7 @@ def _version_extract_cmpop(vstr2): return (cmpop, vstr2) -def version_compare(vstr1, vstr2): +def version_compare(vstr1: str, vstr2: str) -> bool: (cmpop, vstr2) = _version_extract_cmpop(vstr2) return cmpop(Version(vstr1), Version(vstr2)) @@ -619,7 +619,7 @@ def version_compare_many(vstr1, conditions): # determine if the minimum version satisfying the condition |condition| exceeds # the minimum version for a feature |minimum| -def version_compare_condition_with_min(condition, minimum): +def version_compare_condition_with_min(condition, minimum) -> bool: if condition.startswith('>='): cmpop = operator.le condition = condition[2:] |