|
 |
7a3408 |
From 44ca78d0ae968d42803653ef395ce34909f557c6 Mon Sep 17 00:00:00 2001
|
|
|
7a3408 |
Message-Id: <44ca78d0ae968d42803653ef395ce34909f557c6@dist-git>
|
|
|
7a3408 |
From: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Date: Tue, 11 Aug 2015 17:16:03 +0200
|
|
|
7a3408 |
Subject: [PATCH] tests: Temporarily disable ppc64 cpu tests
|
|
|
7a3408 |
|
|
|
7a3408 |
The upcoming commits will make heavy modifications to the ppc64
|
|
|
7a3408 |
driver, split so that it's easier to review the changes.
|
|
|
7a3408 |
|
|
|
7a3408 |
Instead of updating the test cases so that they pass, possibly
|
|
|
7a3408 |
only to update them again with the following commit, disable them
|
|
|
7a3408 |
for the time being.
|
|
|
7a3408 |
|
|
|
7a3408 |
Another commit will update them all in one go once all required
|
|
|
7a3408 |
changes are in place.
|
|
|
7a3408 |
|
|
|
7a3408 |
(cherry picked from commit 04f5a60d4b3354edb44a3597e574633fc28eb2d4)
|
|
|
7a3408 |
|
|
|
7a3408 |
Bug: https://bugzilla.redhat.com/show_bug.cgi?id=1250977
|
|
|
7a3408 |
|
|
|
7a3408 |
Signed-off-by: Andrea Bolognani <abologna@redhat.com>
|
|
|
7a3408 |
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
|
|
|
7a3408 |
---
|
|
|
7a3408 |
tests/cputest.c | 9 +++++++++
|
|
|
7a3408 |
1 file changed, 9 insertions(+)
|
|
|
7a3408 |
|
|
|
7a3408 |
diff --git a/tests/cputest.c b/tests/cputest.c
|
|
|
7a3408 |
index 1e84fd3..4dbccfd 100644
|
|
|
7a3408 |
--- a/tests/cputest.c
|
|
|
7a3408 |
+++ b/tests/cputest.c
|
|
|
7a3408 |
@@ -501,7 +501,9 @@ static const char *model486[] = { "486" };
|
|
|
7a3408 |
static const char *nomodel[] = { "nomodel" };
|
|
|
7a3408 |
static const char *models[] = { "qemu64", "core2duo", "Nehalem" };
|
|
|
7a3408 |
static const char *haswell[] = { "SandyBridge", "Haswell" };
|
|
|
7a3408 |
+/* XXX temporarily disabled
|
|
|
7a3408 |
static const char *ppc_models[] = { "POWER7", "POWER7_v2.1", "POWER7_v2.3", "POWER8_v1.0"};
|
|
|
7a3408 |
+*/
|
|
|
7a3408 |
|
|
|
7a3408 |
static int
|
|
|
7a3408 |
mymain(void)
|
|
|
7a3408 |
@@ -595,8 +597,10 @@ mymain(void)
|
|
|
7a3408 |
DO_TEST_COMPARE("x86", "host-worse", "nehalem-force", VIR_CPU_COMPARE_IDENTICAL);
|
|
|
7a3408 |
DO_TEST_COMPARE("x86", "host-SandyBridge", "exact-force-Haswell", VIR_CPU_COMPARE_IDENTICAL);
|
|
|
7a3408 |
|
|
|
7a3408 |
+ /* XXX temporarily disabled
|
|
|
7a3408 |
DO_TEST_COMPARE("ppc64", "host", "strict", VIR_CPU_COMPARE_IDENTICAL);
|
|
|
7a3408 |
DO_TEST_COMPARE("ppc64", "host", "exact", VIR_CPU_COMPARE_INCOMPATIBLE);
|
|
|
7a3408 |
+ */
|
|
|
7a3408 |
|
|
|
7a3408 |
/* guest updates for migration
|
|
|
7a3408 |
* automatically compares host CPU with the result */
|
|
|
7a3408 |
@@ -625,8 +629,11 @@ mymain(void)
|
|
|
7a3408 |
DO_TEST_BASELINE("x86", "7", 0, 0);
|
|
|
7a3408 |
DO_TEST_BASELINE("x86", "8", 0, 0);
|
|
|
7a3408 |
|
|
|
7a3408 |
+ /* XXX temporarily disabled
|
|
|
7a3408 |
DO_TEST_BASELINE("ppc64", "incompatible-vendors", 0, -1);
|
|
|
7a3408 |
DO_TEST_BASELINE("ppc64", "no-vendor", 0, 0);
|
|
|
7a3408 |
+ */
|
|
|
7a3408 |
+
|
|
|
7a3408 |
/* CPU features */
|
|
|
7a3408 |
DO_TEST_HASFEATURE("x86", "host", "vmx", YES);
|
|
|
7a3408 |
DO_TEST_HASFEATURE("x86", "host", "lm", YES);
|
|
|
7a3408 |
@@ -661,8 +668,10 @@ mymain(void)
|
|
|
7a3408 |
DO_TEST_GUESTDATA("x86", "host-Haswell-noTSX", "Haswell-noTSX",
|
|
|
7a3408 |
NULL, "Haswell-noTSX", 0);
|
|
|
7a3408 |
|
|
|
7a3408 |
+ /* XXX temporarily disabled
|
|
|
7a3408 |
DO_TEST_GUESTDATA("ppc64", "host", "guest", ppc_models, NULL, 0);
|
|
|
7a3408 |
DO_TEST_GUESTDATA("ppc64", "host", "guest-nofallback", ppc_models, "POWER7_v2.1", -1);
|
|
|
7a3408 |
+ */
|
|
|
7a3408 |
|
|
|
7a3408 |
return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
|
|
|
7a3408 |
}
|
|
|
7a3408 |
--
|
|
|
7a3408 |
2.5.0
|
|
|
7a3408 |
|