From: Tim Wiederhake <twiederh@redhat.com>
Date: Tue, 15 Dec 2020 16:24:49 +0000 (+0100)
Subject: cpu-gather: Move model_name to new script
X-Git-Tag: v7.0.0-rc1~167
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a3a3a929c49f333eebed12c29fdc46380a61e8d2;p=thirdparty%2Flibvirt.git

cpu-gather: Move model_name to new script

Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather.py
index f7030eb48b..1b02df6ec7 100755
--- a/tests/cputestdata/cpu-gather.py
+++ b/tests/cputestdata/cpu-gather.py
@@ -4,7 +4,20 @@ import os
 import subprocess
 
 
+def gather_name():
+    with open("/proc/cpuinfo", "rt") as f:
+        for line in f.readlines():
+            if line.startswith("model name"):
+                return line.split(":", 2)[1].strip()
+
+    exit("Error: '/proc/cpuinfo' does not contain a model name.")
+
+
 def main():
+    name = gather_name()
+    print("model name\t: {}".format(name))
+
+    print(end="", flush=True)
     os.environ["CPU_GATHER_PY"] = "true"
     subprocess.check_call("./cpu-gather.sh")
 
diff --git a/tests/cputestdata/cpu-gather.sh b/tests/cputestdata/cpu-gather.sh
index cd65d74da5..b671f223a5 100755
--- a/tests/cputestdata/cpu-gather.sh
+++ b/tests/cputestdata/cpu-gather.sh
@@ -9,8 +9,6 @@ if [ -z "${CPU_GATHER_PY}" ]; then
     exit 1
 fi
 
-grep 'model name' /proc/cpuinfo | head -n1
-
 cpuid -1r
 echo