Signed-off-by: Tim Wiederhake <twiederh@xxxxxxxxxx> --- tests/cputestdata/cpu-gather.py | 31 ------------------------------- tests/cputestdata/cpu-parse.sh | 8 -------- 2 files changed, 39 deletions(-) delete mode 100755 tests/cputestdata/cpu-parse.sh diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather.py index 373f179c8d..b6acae9eb7 100755 --- a/tests/cputestdata/cpu-gather.py +++ b/tests/cputestdata/cpu-gather.py @@ -292,37 +292,6 @@ def parse(args): universal_newlines=True) print(output) - os.environ["CPU_GATHER_PY"] = "true" - os.environ["model"] = data["name"] - os.environ["fname"] = filename - output = subprocess.check_output( - "./cpu-parse.sh", - input=output_to_text(data), - stderr=subprocess.STDOUT, - universal_newlines=True) - print(output) - - -def output_to_text(data): - output = list() - - output.append("model name\t: {}".format(data["name"])) - - output.append("CPU:") - for leave in data["leaves"]: - output.append(" {}".format(leave)) - output.append("") - - if data["via"] is not None: - output.append("MSR{}:".format(data["via"])) - for key, value in sorted(data["msr"].items()): - output.append(" 0x{:x}: 0x{:016x}\n".format(int(key), value)) - - for o in data["model"]: - output.append(json.dumps(o)) - - return "\n".join(output) - def main(): parser = argparse.ArgumentParser(description="Gather cpu test data") diff --git a/tests/cputestdata/cpu-parse.sh b/tests/cputestdata/cpu-parse.sh deleted file mode 100755 index eea15ded2e..0000000000 --- a/tests/cputestdata/cpu-parse.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -if [ -z "${CPU_GATHER_PY}" ]; then - echo >&2 "Do not call this script directly. Use 'cpu-gather.py' instead." - exit 1 -fi - -data=`cat` -- 2.26.2