Fix T56314: wrong operating system records for Ubuntu

We now bundle `distro` to find Linux distribution info. Its source is
https://github.com/nir0s/distro
This commit is contained in:
2018-08-16 15:56:08 +02:00
parent 1d1aa3dab9
commit 84faded0cc
2 changed files with 1201 additions and 3 deletions

View File

@@ -97,9 +97,10 @@ def gatherSystemInfo(ctx):
system_info['machine'] = platform.machine()
system_info['system'] = platform.system()
if system_info['system'] == "Linux":
distro = platform.linux_distribution()
system_info['dist_name'] = distro[0]
system_info['dist_version'] = distro[1]
from .third_party import distro
dist_name, dist_version, *_ = distro.linux_distribution()
system_info['dist_name'] = dist_name
system_info['dist_version'] = dist_version
# system_info['libc_version'] = "-".join(platform.libc_ver())
# TODO(sergey): Make this to work on Windows and macOS
cpu_info = cpuinfo.get_cpu_info()

1197
benchmark/foundation/third_party/distro.py vendored Normal file

File diff suppressed because it is too large Load Diff