External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-21 19:02:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

cpu-gather: Factor out call to cpu-cpuid.py

Browse Source 
This is a preparatory step to merge cpu-cpuid.py.

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
This commit is contained in:
Tim Wiederhake 2021-01-04 12:30:18 +01:00 committed by Jiri Denemark
parent ba05774f57
commit bd05de35ef
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/cputestdata/cpu-gather.py
View File

@ -288,7 +288,7 @@ def output_json(data, filename):
f.write("\n")
def parse(data):
def parse(args, data):
filename = parse_filename(data)
filename_xml = "{}.xml".format(filename)
filename_json = "{}.json".format(filename)
@ -301,10 +301,7 @@ def parse(data):
if os.path.getsize(filename_json) == 0:
return
output = subprocess.check_output(
["./cpu-cpuid.py", "diff", filename_json],
universal_newlines=True)
print(output)
args.json_files = getattr(args, "json_files", list()) + [filename_json]
def main():
@ -359,7 +356,12 @@ def main():
if args.action in ["parse", "full"]:
if args.action == "parse":
data = json.load(sys.stdin)
parse(data)
parse(args, data)
if "json_files" in args:
cmd = ["./cpu-cpuid.py", "diff"]
cmd.extend(args.json_files)
subprocess.check_call(cmd, universal_newlines=True)
if __name__ == "__main__":