Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- tests/cputestdata/cpu-gather.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-gather.py index f679fb9066..b8c1f23c82 100755 --- a/tests/cputestdata/cpu-gather.py +++ b/tests/cputestdata/cpu-gather.py @@ -237,7 +237,7 @@ def parse_filename(data): filename = re.sub("\\(([Rr]|[Tt][Mm])\\)", "", filename) filename = re.sub(".*(Intel|AMD) ", "", filename) filename = re.sub(" (Duo|Quad|II X[0-9]+)", " ", filename) - filename = re.sub(" (CPU|Processor)", "", filename) + filename = re.sub(" (CPU|[Pp]rocessor)", "", filename) filename = re.sub(" @.*", "", filename) filename = re.sub(" APU .*", "", filename) filename = re.sub(" SE$", "", filename) -- 2.30.0

It is now doing way more than gathering the CPU data from a host as the other scripts were merged in it. Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com&gt; --- src/cpu_map/x86_features.xml | 2 +- tests/cputestdata/{cpu-gather.py => cpu-data.py} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename tests/cputestdata/{cpu-gather.py => cpu-data.py} (99%) diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml index 01a777e0e8..5cfa07502a 100644 --- a/src/cpu_map/x86_features.xml +++ b/src/cpu_map/x86_features.xml @@ -1,7 +1,7 @@ <!-- After adding new features, update existing test files with - tests/cputestdata/cpu-gather.py diff tests/cputestdata/x86_64-cpuid-*.json + tests/cputestdata/cpu-data.py diff tests/cputestdata/x86_64-cpuid-*.json --> <cpus> diff --git a/tests/cputestdata/cpu-gather.py b/tests/cputestdata/cpu-data.py similarity index 99% rename from tests/cputestdata/cpu-gather.py rename to tests/cputestdata/cpu-data.py index b8c1f23c82..a41f1d025c 100755 --- a/tests/cputestdata/cpu-gather.py +++ b/tests/cputestdata/cpu-data.py @@ -455,7 +455,7 @@ def main(): help="Reads data from stdin and parses data for libvirt use.") subparsers.add_parser( "full", - help="Equivalent to `cpu-gather gather | cpu-gather parse`.") + help="Equivalent to `cpu-data.py gather | cpu-data.py parse`.") diffparser = subparsers.add_parser( "diff", help="Diff json description of CPU model against known features.") -- 2.30.0