cpu-parse: Move model name detection 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 7c51a47353abcc30e03726a53603c81daa8a183e..0b1019456c50225d57f7f371d120cf1a13ba223f 100755 (executable)
--- a/tests/cputestdata/cpu-gather.py
+++ b/tests/cputestdata/cpu-gather.py
@@ -196,6 +196,7 @@ def parse(args):
     data = json.load(sys.stdin)
 
     os.environ["CPU_GATHER_PY"] = "true"
+    os.environ["model"] = data["name"]
     output = subprocess.check_output(
         "./cpu-parse.sh",
         input=output_to_text(data),

diff --git a/tests/cputestdata/cpu-parse.sh b/tests/cputestdata/cpu-parse.sh
index fa4344b6ad04e0c4a1b601704fb798f256773b16..5b8e57e427b41b5b31b92023484721b71b80b794 100755 (executable)
--- a/tests/cputestdata/cpu-parse.sh
+++ b/tests/cputestdata/cpu-parse.sh
@@ -7,8 +7,6 @@ fi
 
 data=`cat`
 
-model=`sed -ne '/^model name[  ]*:/ {s/^[^:]*: \(.*\)/\1/p; q}' <<<"$data"`
-
 fname=`sed -e 's/^ *//;
                s/ *$//;
                s/[ -]\+ \+/ /g;