diff options
| author | dyung <douglas.yung@sony.com> | 2024-07-22 11:28:11 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-22 11:28:11 -0700 |
| commit | 9374216d4b2c408a4537bdb6af05f1bc1e5e562b (patch) | |
| tree | 535fa561dfd5382631f355d7763c4fcc801e8ea5 /cross-project-tests | |
| parent | 9d76231fcd3f6ddf9bd6aafe7f143404cad7e4a1 (diff) | |
Replace distutils.version with packaging.version since the former was deprecated in python 3.10 and removed in 3.12. (#99852)
Attempt to reland #99549, but using packaging.version instead of
looseversion, based on the usage used for LLDB in #93712.
Diffstat (limited to 'cross-project-tests')
| -rw-r--r-- | cross-project-tests/lit.cfg.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/cross-project-tests/lit.cfg.py b/cross-project-tests/lit.cfg.py index 774c4eaf4d97..9935fe6a199d 100644 --- a/cross-project-tests/lit.cfg.py +++ b/cross-project-tests/lit.cfg.py @@ -4,9 +4,6 @@ import re import subprocess import sys -# TODO: LooseVersion is undocumented; use something else. -from distutils.version import LooseVersion - import lit.formats import lit.util @@ -279,7 +276,11 @@ dwarf_version_string = get_clang_default_dwarf_version_string(config.host_triple gdb_version_string = get_gdb_version_string() if dwarf_version_string and gdb_version_string: if int(dwarf_version_string) >= 5: - if LooseVersion(gdb_version_string) < LooseVersion("10.1"): + try: + from packaging import version + except: + lit_config.fatal("Running gdb tests requires the packaging package") + if version.parse(gdb_version_string) < version.parse("10.1"): # Example for llgdb-tests, which use lldb on darwin but gdb elsewhere: # XFAIL: !system-darwin && gdb-clang-incompatibility config.available_features.add("gdb-clang-incompatibility") |
