tests: Unify data structure for vircaps2xmltest

Browse Source

If all we achieve is reducing the depth by one for a single
test case, the additional complexity (not to mention breaking
the principle of least surprise) is not worth it: let's use
simpler, more predictable code instead.

This basically reverts fec6e4c48c (with a few adjustments).

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

...

This commit is contained in:

Andrea Bolognani

2018-08-06 13:44:59 +02:00

parent 0a5a6f0d01

commit 65952b249f

121 changed files with 14 additions and 23 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu0/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu0/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu1/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu1/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu10/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu10/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu11/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu11/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu12/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu12/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu13/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu13/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu14/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu14/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu15/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu15/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu2/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu2/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu3/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu3/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu4/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu4/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu5/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu5/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu6/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu6/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu7/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu7/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu8/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu8/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_id

tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/core_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/core_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/physical_package_id → tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/physical_package_id

tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_siblings → tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings

tests/vircaps2xmldata/linux-basic/cpu/cpu9/topology/thread_siblings_list → tests/vircaps2xmldata/linux-basic/system/cpu/cpu9/topology/thread_siblings_list

tests/vircaps2xmldata/linux-basic/cpu/online → tests/vircaps2xmldata/linux-basic/system/cpu/online

tests/vircaps2xmldata/linux-basic/cpu/present → tests/vircaps2xmldata/linux-basic/system/cpu/present

tests/vircaps2xmldata/linux-basic/node/node0/cpu0 → tests/vircaps2xmldata/linux-basic/system/node/node0/cpu0

tests/vircaps2xmldata/linux-basic/node/node0/cpu1 → tests/vircaps2xmldata/linux-basic/system/node/node0/cpu1

Some files were not shown because too many files have changed in this diff Show More