[PATCH 43/51] qemuxml2argvtest: Modernize 'cpu-exact' cases
Use real capabilities, but select the fake 'Haswell' host CPU for test
stability.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../{cpu-exact1.args => cpu-exact1.x86_64-latest.args} | 0
...back.args => cpu-exact2-nofallback.x86_64-latest.args} | 0
.../{cpu-exact2.args => cpu-exact2.x86_64-latest.args} | 0
...es.args => cpu-no-removed-features.x86_64-latest.args} | 0
tests/qemuxml2argvtest.c | 8 ++++----
5 files changed, 4 insertions(+), 4 deletions(-)
rename tests/qemuxml2argvdata/{cpu-exact1.args => cpu-exact1.x86_64-latest.args}
(100%)
rename tests/qemuxml2argvdata/{cpu-exact2-nofallback.args =>
cpu-exact2-nofallback.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{cpu-exact2.args => cpu-exact2.x86_64-latest.args}
(100%)
rename tests/qemuxml2argvdata/{cpu-no-removed-features.args =>
cpu-no-removed-features.x86_64-latest.args} (100%)
diff --git a/tests/qemuxml2argvdata/cpu-exact1.args
b/tests/qemuxml2argvdata/cpu-exact1.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-exact1.args
rename to tests/qemuxml2argvdata/cpu-exact1.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
b/tests/qemuxml2argvdata/cpu-exact2-nofallback.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-exact2-nofallback.args
rename to tests/qemuxml2argvdata/cpu-exact2-nofallback.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-exact2.args
b/tests/qemuxml2argvdata/cpu-exact2.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-exact2.args
rename to tests/qemuxml2argvdata/cpu-exact2.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args
b/tests/qemuxml2argvdata/cpu-no-removed-features.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-no-removed-features.args
rename to tests/qemuxml2argvdata/cpu-no-removed-features.x86_64-latest.args
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 6997d7400c..cea936518e 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1739,11 +1739,11 @@ mymain(void)
DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum1", "x86_64",
ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-minimum2", "x86_64",
ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
- DO_TEST("cpu-exact1", QEMU_CAPS_KVM);
- DO_TEST("cpu-exact2", QEMU_CAPS_KVM);
- DO_TEST("cpu-exact2-nofallback", QEMU_CAPS_KVM);
+ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact1", "x86_64",
ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
+ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact2", "x86_64",
ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
+ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-exact2-nofallback", "x86_64",
ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-strict1", "x86_64",
ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
- DO_TEST("cpu-no-removed-features", QEMU_CAPS_KVM);
+ DO_TEST_CAPS_ARCH_LATEST_FULL("cpu-no-removed-features",
"x86_64", ARG_CAPS_HOST_CPU_MODEL, QEMU_CPU_DEF_HASWELL);
/* EPYC-Milan became available in qemu-6.0, use it for the fallback tests */
DO_TEST_CAPS_VER_FAILURE("cpu-nofallback", "5.2.0");
--
2.41.0