In some cases preferred model doesn't really do anything since the
result remains the same even if it is removed.
Signed-off-by: Jiri Denemark <jdenemar@xxxxxxxxxx>
---
tests/cputest.c | 13 +++++--------
...esult.xml => x86-host+host+host-model,models-result.xml} | 0
...ml => x86-host-Haswell-noTSX+Haswell,haswell-result.xml} | 0
...x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml} | 0
....xml => x86-host-Haswell-noTSX+Haswell-noTSX-result.xml} | 0
5 files changed, 5 insertions(+), 8 deletions(-)
rename tests/cputestdata/{x86-host+host+host-model,models,Penryn-result.xml => x86-host+host+host-model,models-result.xml} (100%)
rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell,haswell,Haswell-result.xml => x86-host-Haswell-noTSX+Haswell,haswell-result.xml} (100%)
rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,haswell,Haswell-noTSX-result.xml => x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml} (100%)
rename tests/cputestdata/{x86-host-Haswell-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml => x86-host-Haswell-noTSX+Haswell-noTSX-result.xml} (100%)
diff --git a/tests/cputest.c b/tests/cputest.c
index 7496156..6810832 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -799,18 +799,15 @@ mymain(void)
DO_TEST_GUESTDATA("x86", "host", "guest", models, NULL, 0);
DO_TEST_GUESTDATA("x86", "host", "guest", nomodel, NULL, -1);
DO_TEST_GUESTDATA("x86", "host", "guest-nofallback", models, NULL, /*-1*/ -2);
- DO_TEST_GUESTDATA("x86", "host", "host+host-model", models, "Penryn", 0);
+ DO_TEST_GUESTDATA("x86", "host", "host+host-model", models, NULL, 0);
DO_TEST_GUESTDATA("x86", "host", "host+host-model-nofallback", models, NULL, /*-1*/ -2);
- DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell",
- haswell, "Haswell", 0);
- DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX",
- haswell, "Haswell-noTSX", 0);
+ DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell", haswell, NULL, 0);
+ DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX", haswell, NULL, 0);
DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX-nofallback", haswell, NULL, /*-1*/ -2);
- DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX",
- NULL, "Haswell-noTSX", 0);
+ DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX", NULL, NULL, 0);
DO_TEST_GUESTDATA("ppc64", "host", "guest", ppc_models, NULL, 0);
- DO_TEST_GUESTDATA("ppc64", "host", "guest-nofallback", ppc_models, "POWER8", -1);
+ DO_TEST_GUESTDATA("ppc64", "host", "guest-nofallback", ppc_models, NULL, -1);
DO_TEST_GUESTDATA("ppc64", "host", "guest-legacy", ppc_models, NULL, 0);
DO_TEST_GUESTDATA("ppc64", "host", "guest-legacy-incompatible", ppc_models, NULL, -1);
DO_TEST_GUESTDATA("ppc64", "host", "guest-legacy-invalid", ppc_models, NULL, -1);
diff --git a/tests/cputestdata/x86-host+host+host-model,models,Penryn-result.xml b/tests/cputestdata/x86-host+host+host-model,models-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host+host+host-model,models,Penryn-result.xml
rename to tests/cputestdata/x86-host+host+host-model,models-result.xml
diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell,Haswell-result.xml b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell,Haswell-result.xml
rename to tests/cputestdata/x86-host-Haswell-noTSX+Haswell,haswell-result.xml
diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell,Haswell-noTSX-result.xml b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell,Haswell-noTSX-result.xml
rename to tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
diff --git a/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml b/tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX,Haswell-noTSX-result.xml
rename to tests/cputestdata/x86-host-Haswell-noTSX+Haswell-noTSX-result.xml
--
2.10.2
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list