External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 13:45:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Re-enable ppc64 cpu tests

Browse Source 
Now that all the changes have been implemented we can run the
test cases once again, after updating them to reflect the new
behaviour.
This commit is contained in:
Andrea Bolognani 2015-08-07 17:39:20 +02:00
parent 344d1675e8
commit 049df97504
12 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/cputest.c
View File

@ -501,9 +501,7 @@ static const char *model486[] = { "486" };
static const char *nomodel[] = { "nomodel" }; static const char *nomodel[] = { "nomodel" };
static const char *models[] = { "qemu64", "core2duo", "Nehalem" }; static const char *models[] = { "qemu64", "core2duo", "Nehalem" };
static const char *haswell[] = { "SandyBridge", "Haswell" }; static const char *haswell[] = { "SandyBridge", "Haswell" };
/* XXX temporarily disabled static const char *ppc_models[] = { "POWER6", "POWER7", "POWER8" };
static const char *ppc_models[] = { "POWER7", "POWER7_v2.1", "POWER7_v2.3", "POWER8_v1.0"};
*/
static int static int
mymain(void) mymain(void)
@ -597,10 +595,8 @@ mymain(void)
DO_TEST_COMPARE("x86", "host-worse", "nehalem-force", VIR_CPU_COMPARE_IDENTICAL); DO_TEST_COMPARE("x86", "host-worse", "nehalem-force", VIR_CPU_COMPARE_IDENTICAL);
DO_TEST_COMPARE("x86", "host-SandyBridge", "exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL); DO_TEST_COMPARE("x86", "host-SandyBridge", "exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL);
/* XXX temporarily disabled DO_TEST_COMPARE("ppc64", "host", "guest-strict", VIR_CPU_COMPARE_IDENTICAL);
DO_TEST_COMPARE("ppc64", "host", "strict", VIR_CPU_COMPARE_IDENTICAL); DO_TEST_COMPARE("ppc64", "host", "guest-exact", VIR_CPU_COMPARE_INCOMPATIBLE);
DO_TEST_COMPARE("ppc64", "host", "exact", VIR_CPU_COMPARE_INCOMPATIBLE);
*/
/* guest updates for migration /* guest updates for migration
* automatically compares host CPU with the result */ * automatically compares host CPU with the result */
@ -629,10 +625,8 @@ mymain(void)
DO_TEST_BASELINE("x86", "7", 0, 0); DO_TEST_BASELINE("x86", "7", 0, 0);
DO_TEST_BASELINE("x86", "8", 0, 0); DO_TEST_BASELINE("x86", "8", 0, 0);
/* XXX temporarily disabled
DO_TEST_BASELINE("ppc64", "incompatible-vendors", 0, -1); DO_TEST_BASELINE("ppc64", "incompatible-vendors", 0, -1);
DO_TEST_BASELINE("ppc64", "no-vendor", 0, 0); DO_TEST_BASELINE("ppc64", "no-vendor", 0, 0);
*/
/* CPU features */ /* CPU features */
DO_TEST_HASFEATURE("x86", "host", "vmx", YES); DO_TEST_HASFEATURE("x86", "host", "vmx", YES);
@ -668,10 +662,8 @@ mymain(void)
DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX", DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX",
NULL, "Haswell-noTSX", 0); NULL, "Haswell-noTSX", 0);
/* XXX temporarily disabled
DO_TEST_GUESTDATA("ppc64", "host", "guest", ppc_models, NULL, 0); DO_TEST_GUESTDATA("ppc64", "host", "guest", ppc_models, NULL, 0);
DO_TEST_GUESTDATA("ppc64", "host", "guest-nofallback", ppc_models, "POWER7_v2.1", -1); DO_TEST_GUESTDATA("ppc64", "host", "guest-nofallback", ppc_models, "POWER8", -1);
*/
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE; return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
} }

4
tests/cputestdata/ppc64-baseline-incompatible-vendors.xml
View File

@ -1,13 +1,13 @@
<cpuTest> <cpuTest>
<cpu> <cpu>
<arch>ppc64</arch> <arch>ppc64</arch>
<model>POWER7+_v2.1</model> <model>POWER7</model>
<vendor>Intel</vendor> <vendor>Intel</vendor>
<topology sockets='2' cores='4' threads='1'/> <topology sockets='2' cores='4' threads='1'/>
</cpu> </cpu>
<cpu> <cpu>
<arch>ppc64</arch> <arch>ppc64</arch>
<model>POWER8_v1.0</model> <model>POWER8</model>
<vendor>Intel</vendor> <vendor>Intel</vendor>
<topology sockets='1' cores='1' threads='1'/> <topology sockets='1' cores='1' threads='1'/>
</cpu> </cpu>

2
tests/cputestdata/ppc64-baseline-no-vendor-result.xml
View File

@ -1,3 +1,3 @@
<cpu mode='custom' match='exact'> <cpu mode='custom' match='exact'>
<model fallback='allow'>POWER7_v2.3</model> <model fallback='forbid'>POWER7</model>
</cpu> </cpu>

2
tests/cputestdata/ppc64-baseline-no-vendor.xml
View File

@ -1,7 +1,7 @@
<cpuTest> <cpuTest>
<cpu> <cpu>
<arch>ppc64</arch> <arch>ppc64</arch>
<model>POWER7_v2.3</model> <model>POWER7</model>
<topology sockets='2' cores='4' threads='1'/> <topology sockets='2' cores='4' threads='1'/>
</cpu> </cpu>
</cpuTest> </cpuTest>

3
tests/cputestdata/ppc64-exact.xml
View File

@ -1,3 +0,0 @@
<cpu match='exact'>
<model>POWER8_v1.0</model>
</cpu>

3
tests/cputestdata/ppc64-guest-exact.xml Normal file
View File

@ -0,0 +1,3 @@
<cpu match='exact'>
<model>POWER8</model>
</cpu>

3
tests/cputestdata/ppc64-guest-nofallback.xml
View File

@ -1,4 +1,3 @@
<cpu match='exact'> <cpu match='exact'>
<model fallback='forbid'>POWER7_v2.1</model> <model fallback='forbid'>POWER8</model>
<topology sockets='2' cores='4' threads='1'/>
</cpu> </cpu>

3
tests/cputestdata/ppc64-guest-strict.xml Normal file
View File

@ -0,0 +1,3 @@
<cpu match='strict'>
<model>POWER7</model>
</cpu>

3
tests/cputestdata/ppc64-guest.xml
View File

@ -1,4 +1,3 @@
<cpu match='exact'> <cpu match='exact'>
<model>POWER7_v2.3</model> <model fallback='allow'>POWER7</model>
<topology sockets='2' cores='4' threads='1'/>
</cpu> </cpu>

2
tests/cputestdata/ppc64-host+guest,ppc_models-result.xml
View File

@ -1,5 +1,5 @@
<cpu mode='custom' match='exact'> <cpu mode='custom' match='exact'>
<arch>ppc64</arch> <arch>ppc64</arch>
<model fallback='allow'>POWER7_v2.3</model> <model fallback='allow'>POWER7</model>
<vendor>IBM</vendor> <vendor>IBM</vendor>
</cpu> </cpu>

2
tests/cputestdata/ppc64-host.xml
View File

@ -1,6 +1,6 @@
<cpu> <cpu>
<arch>ppc64</arch> <arch>ppc64</arch>
<model>POWER7_v2.3</model> <model>POWER7</model>
<vendor>IBM</vendor> <vendor>IBM</vendor>
<topology sockets='1' cores='64' threads='1'/> <topology sockets='1' cores='64' threads='1'/>
</cpu> </cpu>

3
tests/cputestdata/ppc64-strict.xml
View File

@ -1,3 +0,0 @@
<cpu match='exact'>
<model>POWER7_v2.3</model>
</cpu>