[libvirt] [PATCH 09/10] cputest: Rename nehalem-force to penryn-force
The actual CPU model in the data files is Penryn which makes the file
name look rather strange. Well, one of them contains Nehalem, but that's
a bug which will be fixed in the following patch.
Signed-off-by: Jiri Denemark <jdenemar(a)redhat.com>
---
tests/cputest.c | 4 ++--
...host+nehalem-force-result.xml => x86-host+penryn-force-result.xml} | 0
tests/cputestdata/{x86-nehalem-force.xml => x86-penryn-force.xml} | 0
3 files changed, 2 insertions(+), 2 deletions(-)
rename tests/cputestdata/{x86-host+nehalem-force-result.xml =>
x86-host+penryn-force-result.xml} (100%)
rename tests/cputestdata/{x86-nehalem-force.xml => x86-penryn-force.xml} (100%)
diff --git a/tests/cputest.c b/tests/cputest.c
index b0e63b3..99f4ed3 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -745,7 +745,7 @@ mymain(void)
DO_TEST_COMPARE("x86", "host", "guest",
VIR_CPU_COMPARE_SUPERSET);
DO_TEST_COMPARE("x86", "host", "pentium3-amd",
VIR_CPU_COMPARE_INCOMPATIBLE);
DO_TEST_COMPARE("x86", "host-amd", "pentium3-amd",
VIR_CPU_COMPARE_SUPERSET);
- DO_TEST_COMPARE("x86", "host-worse", "nehalem-force",
VIR_CPU_COMPARE_IDENTICAL);
+ DO_TEST_COMPARE("x86", "host-worse", "penryn-force",
VIR_CPU_COMPARE_IDENTICAL);
DO_TEST_COMPARE("x86", "host-SandyBridge",
"exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL);
DO_TEST_COMPARE("ppc64", "host", "guest-strict",
VIR_CPU_COMPARE_IDENTICAL);
@@ -816,7 +816,7 @@ mymain(void)
DO_TEST_GUESTDATA("x86", "host-better", "pentium3",
NULL, "core2duo", 0);
DO_TEST_GUESTDATA("x86", "host-worse", "guest", NULL,
NULL, 0);
DO_TEST_GUESTDATA("x86", "host", "strict-force-extra",
NULL, NULL, 0);
- DO_TEST_GUESTDATA("x86", "host", "nehalem-force", NULL,
NULL, 0);
+ DO_TEST_GUESTDATA("x86", "host", "penryn-force", NULL,
NULL, 0);
DO_TEST_GUESTDATA("x86", "host", "guest", model486,
NULL, 0);
DO_TEST_GUESTDATA("x86", "host", "guest", models, NULL,
0);
DO_TEST_GUESTDATA("x86", "host", "guest", models,
"Penryn", 0);
diff --git a/tests/cputestdata/x86-host+nehalem-force-result.xml
b/tests/cputestdata/x86-host+penryn-force-result.xml
similarity index 100%
rename from tests/cputestdata/x86-host+nehalem-force-result.xml
rename to tests/cputestdata/x86-host+penryn-force-result.xml
diff --git a/tests/cputestdata/x86-nehalem-force.xml
b/tests/cputestdata/x86-penryn-force.xml
similarity index 100%
rename from tests/cputestdata/x86-nehalem-force.xml
rename to tests/cputestdata/x86-penryn-force.xml
--
2.8.4