From 78b148c3c8f1e9c4ad234827eb16df9109a5dce6 Mon Sep 17 00:00:00 2001 From: Jiri Denemark Date: Thu, 21 Feb 2019 20:10:48 +0100 Subject: [PATCH] cputest: Adapt scripts to split cpu_map MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The tests/cputestdata/cpu-parse.sh script has been broken since the cpu_map.xml file was split into several XMLs. Signed-off-by: Jiri Denemark Reviewed-by: Ján Tomko --- tests/cputestdata/cpu-cpuid.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/tests/cputestdata/cpu-cpuid.py b/tests/cputestdata/cpu-cpuid.py index c45118512d..9ee83e0cd2 100755 --- a/tests/cputestdata/cpu-cpuid.py +++ b/tests/cputestdata/cpu-cpuid.py @@ -301,15 +301,13 @@ def parseFeature(data): def parseMap(): path = os.path.dirname(sys.argv[0]) - path = os.path.join(path, "..", "..", "src", "cpu", "cpu_map.xml") + path = os.path.join(path, "..", "..", "src", "cpu_map", "x86_features.xml") with open(path, "r") as f: data = xmltodict.parse(f) cpuMap = {} - for arch in data["cpus"]["arch"]: - if arch["@name"] == "x86": - for feature in arch["feature"]: - cpuMap[feature["@name"]] = parseFeature(feature["cpuid"]) + for feature in data["cpus"]["feature"]: + cpuMap[feature["@name"]] = parseFeature(feature["cpuid"]) return cpuMap -- GitLab