3:54 a.m.
The files contained the "-invalid" marker in their filename, marking
them as test cases that are supposed to fail. Unfortunately, the
"-invalid" marker does not discriminate between different tests the
files might be used in.
A later patch will introduce a new test validating the XML. This
test is not supposed to fail, as the files contain valid XML.
Signed-off-by: Tim Wiederhake <twiederh(a)redhat.com>
---
tests/cputest.c | 10 +++++-----
...t-compat-invalid.xml => ppc64-guest-compat-bad.xml} | 0
...t-legacy-invalid.xml => ppc64-guest-legacy-bad.xml} | 0
...pat-invalid.xml => ppc64-host+guest-compat-bad.xml} | 0
...acy-invalid.xml => ppc64-host+guest-legacy-bad.xml} | 0
5 files changed, 5 insertions(+), 5 deletions(-)
rename tests/cputestdata/{ppc64-guest-compat-invalid.xml =>
ppc64-guest-compat-bad.xml} (100%)
rename tests/cputestdata/{ppc64-guest-legacy-invalid.xml =>
ppc64-guest-legacy-bad.xml} (100%)
rename tests/cputestdata/{ppc64-host+guest-compat-invalid.xml =>
ppc64-host+guest-compat-bad.xml} (100%)
rename tests/cputestdata/{ppc64-host+guest-legacy-invalid.xml =>
ppc64-host+guest-legacy-bad.xml} (100%)
diff --git a/tests/cputest.c b/tests/cputest.c
index 78a7f2437a..90f319bf9c 100644
--- a/tests/cputest.c
+++ b/tests/cputest.c
@@ -1137,10 +1137,10 @@ mymain(void)
DO_TEST_COMPARE(VIR_ARCH_PPC64, "host", "guest-exact",
VIR_CPU_COMPARE_INCOMPATIBLE);
DO_TEST_COMPARE(VIR_ARCH_PPC64, "host", "guest-legacy",
VIR_CPU_COMPARE_IDENTICAL);
DO_TEST_COMPARE(VIR_ARCH_PPC64, "host",
"guest-legacy-incompatible", VIR_CPU_COMPARE_INCOMPATIBLE);
- DO_TEST_COMPARE(VIR_ARCH_PPC64, "host", "guest-legacy-invalid",
VIR_CPU_COMPARE_ERROR);
+ DO_TEST_COMPARE(VIR_ARCH_PPC64, "host", "guest-legacy-bad",
VIR_CPU_COMPARE_ERROR);
DO_TEST_COMPARE(VIR_ARCH_PPC64, "host", "guest-compat-none",
VIR_CPU_COMPARE_IDENTICAL);
DO_TEST_COMPARE(VIR_ARCH_PPC64, "host", "guest-compat-valid",
VIR_CPU_COMPARE_IDENTICAL);
- DO_TEST_COMPARE(VIR_ARCH_PPC64, "host", "guest-compat-invalid",
VIR_CPU_COMPARE_ERROR);
+ DO_TEST_COMPARE(VIR_ARCH_PPC64, "host", "guest-compat-bad",
VIR_CPU_COMPARE_ERROR);
DO_TEST_COMPARE(VIR_ARCH_PPC64, "host",
"guest-compat-incompatible", VIR_CPU_COMPARE_INCOMPATIBLE);
/* guest updates for migration
@@ -1158,10 +1158,10 @@ mymain(void)
DO_TEST_UPDATE(VIR_ARCH_PPC64, "host", "guest-nofallback",
VIR_CPU_COMPARE_INCOMPATIBLE);
DO_TEST_UPDATE(VIR_ARCH_PPC64, "host", "guest-legacy",
VIR_CPU_COMPARE_IDENTICAL);
DO_TEST_UPDATE(VIR_ARCH_PPC64, "host",
"guest-legacy-incompatible", VIR_CPU_COMPARE_INCOMPATIBLE);
- DO_TEST_UPDATE(VIR_ARCH_PPC64, "host", "guest-legacy-invalid",
VIR_CPU_COMPARE_ERROR);
+ DO_TEST_UPDATE(VIR_ARCH_PPC64, "host", "guest-legacy-bad",
VIR_CPU_COMPARE_ERROR);
DO_TEST_UPDATE(VIR_ARCH_PPC64, "host", "guest-compat-none",
VIR_CPU_COMPARE_IDENTICAL);
DO_TEST_UPDATE(VIR_ARCH_PPC64, "host", "guest-compat-valid",
VIR_CPU_COMPARE_IDENTICAL);
- DO_TEST_UPDATE(VIR_ARCH_PPC64, "host", "guest-compat-invalid",
VIR_CPU_COMPARE_ERROR);
+ DO_TEST_UPDATE(VIR_ARCH_PPC64, "host", "guest-compat-bad",
VIR_CPU_COMPARE_ERROR);
DO_TEST_UPDATE(VIR_ARCH_PPC64, "host",
"guest-compat-incompatible", VIR_CPU_COMPARE_INCOMPATIBLE);
/* computing baseline CPUs */
@@ -1216,7 +1216,7 @@ mymain(void)
DO_TEST_GUESTCPU(VIR_ARCH_PPC64, "host", "guest-nofallback",
ppc_models, -1);
DO_TEST_GUESTCPU(VIR_ARCH_PPC64, "host", "guest-legacy",
ppc_models, 0);
DO_TEST_GUESTCPU(VIR_ARCH_PPC64, "host",
"guest-legacy-incompatible", ppc_models, -1);
- DO_TEST_GUESTCPU(VIR_ARCH_PPC64, "host", "guest-legacy-invalid",
ppc_models, -1);
+ DO_TEST_GUESTCPU(VIR_ARCH_PPC64, "host", "guest-legacy-bad",
ppc_models, -1);
DO_TEST_CPUID(VIR_ARCH_X86_64, "A10-5800K", JSON_HOST);
DO_TEST_CPUID(VIR_ARCH_X86_64, "Atom-D510", JSON_NONE);
diff --git a/tests/cputestdata/ppc64-guest-compat-invalid.xml
b/tests/cputestdata/ppc64-guest-compat-bad.xml
similarity index 100%
rename from tests/cputestdata/ppc64-guest-compat-invalid.xml
rename to tests/cputestdata/ppc64-guest-compat-bad.xml
diff --git a/tests/cputestdata/ppc64-guest-legacy-invalid.xml
b/tests/cputestdata/ppc64-guest-legacy-bad.xml
similarity index 100%
rename from tests/cputestdata/ppc64-guest-legacy-invalid.xml
rename to tests/cputestdata/ppc64-guest-legacy-bad.xml
diff --git a/tests/cputestdata/ppc64-host+guest-compat-invalid.xml
b/tests/cputestdata/ppc64-host+guest-compat-bad.xml
similarity index 100%
rename from tests/cputestdata/ppc64-host+guest-compat-invalid.xml
rename to tests/cputestdata/ppc64-host+guest-compat-bad.xml
diff --git a/tests/cputestdata/ppc64-host+guest-legacy-invalid.xml
b/tests/cputestdata/ppc64-host+guest-legacy-bad.xml
similarity index 100%
rename from tests/cputestdata/ppc64-host+guest-legacy-invalid.xml
rename to tests/cputestdata/ppc64-host+guest-legacy-bad.xml
--
2.26.2