tests: Add resctrl-skx-twocaches test case to vircaps2xmltest

This doesn't add very much value for now, but future test for virresctrl will take information from vircaps2xmldata (since it is dependent on the same info then why duplicate it) and this particular use case helps us cover bit more of the code regarding proper formatting and handling errors. And one more test for vircaps2xmltest doesn't hurt either. Signed-off-by: N Martin Kletzander <mkletzan@redhat.com> Reviewed-by: N John Ferlan <jferlan@redhat.com>

tests: Add resctrl-skx-twocaches test case to vircaps2xmltest
This doesn't add very much value for now, but future test for virresctrl will take information from vircaps2xmldata (since it is dependent on the same info then why duplicate it) and this particular use case helps us cover bit more of the code regarding proper formatting and handling errors. And one more test for vircaps2xmltest doesn't hurt either. Signed-off-by: N Martin Kletzander <mkletzan@redhat.com> Reviewed-by: N John Ferlan <jferlan@redhat.com>
d8070145 · Martin Kletzander · 993c7f00 · d8070145 · d8070145 · d8070145
33 changed file
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/cbm_mask
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/cbm_mask
+7ff
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/min_cbm_bits
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/min_cbm_bits
+1
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/num_closids
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/info/L3/num_closids
+16
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/schemata
+L3:0=0f0;1=000
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/some_reservation/schemata
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/resctrl/some_reservation/schemata
+L3:0=70e;1=3ff
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/id
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/id
+0
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/level
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/level
+3
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_list
+0
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/shared_cpu_map
+001
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/size
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/size
+33M
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/type
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index0/type
+Unified
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/id
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/id
+1
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/level
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/level
+3
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_list
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_list
+0
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_map
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/shared_cpu_map
+001
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/size
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/size
+33M
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/type
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/cache/index1/type
+Unified
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/online
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/online
+1
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_id
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_id
+0
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings
+001
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings_list
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/core_siblings_list
+0
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/physical_package_id
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/physical_package_id
+0
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings
+001
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings_list
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/cpu0/topology/thread_siblings_list
+0
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/online
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/online
+0
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/present
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/cpu/present
+0
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpu0
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpu0
+../../cpu/cpu0
\ No newline at end of file
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpulist
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpulist
+0
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpumap
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/cpumap
+001
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/distance
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/node0/distance
+10
--- a/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/online
+++ b/tests/vircaps2xmldata/linux-resctrl-skx-twocaches/system/node/online
+0
--- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
+++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-skx-twocaches.xml
+<capabilities>
+  <host>
+    <cpu>
+      <arch>x86_64</arch>
+    </cpu>
+    <power_management/>
+    <migration_features>
+      <live/>
+    </migration_features>
+    <topology>
+      <cells num='1'>
+        <cell id='0'>
+          <memory unit='KiB'>1048576</memory>
+          <pages unit='KiB' size='4'>2048</pages>
+          <pages unit='KiB' size='2048'>4096</pages>
+          <pages unit='KiB' size='1048576'>6144</pages>
+          <cpus num='1'>
+            <cpu id='0' socket_id='0' core_id='0' siblings='0'/>
+          </cpus>
+        </cell>
+      </cells>
+    </topology>
+    <cache>
+      <bank id='0' level='3' type='both' size='33' unit='MiB' cpus='0'>
+        <control granularity='3' unit='MiB' type='both' maxAllocs='16'/>
+      </bank>
+      <bank id='1' level='3' type='both' size='33' unit='MiB' cpus='0'>
+        <control granularity='3' unit='MiB' type='both' maxAllocs='16'/>
+      </bank>
+    </cache>
+  </host>
+</capabilities>
--- a/tests/vircaps2xmltest.c
+++ b/tests/vircaps2xmltest.c
@@ -121,6 +121,7 @@ mymain(void)
    DO_TEST_FULL("resctrl", VIR_ARCH_X86_64, true, true, true);
    DO_TEST_FULL("resctrl-cdp", VIR_ARCH_X86_64, true, true, true);
    DO_TEST_FULL("resctrl-skx", VIR_ARCH_X86_64, true, true, true);
+    DO_TEST_FULL("resctrl-skx-twocaches", VIR_ARCH_X86_64, true, true, true);
    return ret;
 }