[PATCH 30/31] qemuxml2argvtest: Use real capabilities for negative test cases for ppc64 architecture
Peter Krempa
pkrempa at redhat.com
Thu Mar 30 13:38:24 UTC 2023
Convert the last outstanding test cases for ppc64 to use real
capabilities.
In couple cases this actually fixes the test case to test what it was
intending to do.
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
...r => aarch64-gic-not-arm.ppc64-latest.err} | 0
... cpu-hotplug-granularity.ppc64-latest.err} | 0
....err => ppc64-tpm-double.ppc64-latest.err} | 0
...=> ppc64-tpmproxy-double.ppc64-latest.err} | 0
.../qemuxml2argvdata/pseries-no-parallel.err | 1 -
.../pseries-no-parallel.ppc64-latest.err | 1 +
...b-invalid-target-index-1.ppc64-latest.err} | 0
...b-invalid-target-index-2.ppc64-latest.err} | 0
...b-invalid-target-index-3.ppc64-latest.err} | 0
.../pseries-spaprvio-invalid.err | 1 -
.../pseries-spaprvio-invalid.ppc64-latest.err | 1 +
tests/qemuxml2argvtest.c | 29 ++++++-------------
12 files changed, 11 insertions(+), 22 deletions(-)
rename tests/qemuxml2argvdata/{aarch64-gic-not-arm.err => aarch64-gic-not-arm.ppc64-latest.err} (100%)
rename tests/qemuxml2argvdata/{cpu-hotplug-granularity.err => cpu-hotplug-granularity.ppc64-latest.err} (100%)
rename tests/qemuxml2argvdata/{ppc64-tpm-double.err => ppc64-tpm-double.ppc64-latest.err} (100%)
rename tests/qemuxml2argvdata/{ppc64-tpmproxy-double.err => ppc64-tpmproxy-double.ppc64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/pseries-no-parallel.err
create mode 100644 tests/qemuxml2argvdata/pseries-no-parallel.ppc64-latest.err
rename tests/qemuxml2argvdata/{pseries-phb-invalid-target-index-1.err => pseries-phb-invalid-target-index-1.ppc64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pseries-phb-invalid-target-index-2.err => pseries-phb-invalid-target-index-2.ppc64-latest.err} (100%)
rename tests/qemuxml2argvdata/{pseries-phb-invalid-target-index-3.err => pseries-phb-invalid-target-index-3.ppc64-latest.err} (100%)
delete mode 100644 tests/qemuxml2argvdata/pseries-spaprvio-invalid.err
create mode 100644 tests/qemuxml2argvdata/pseries-spaprvio-invalid.ppc64-latest.err
diff --git a/tests/qemuxml2argvdata/aarch64-gic-not-arm.err b/tests/qemuxml2argvdata/aarch64-gic-not-arm.ppc64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/aarch64-gic-not-arm.err
rename to tests/qemuxml2argvdata/aarch64-gic-not-arm.ppc64-latest.err
diff --git a/tests/qemuxml2argvdata/cpu-hotplug-granularity.err b/tests/qemuxml2argvdata/cpu-hotplug-granularity.ppc64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/cpu-hotplug-granularity.err
rename to tests/qemuxml2argvdata/cpu-hotplug-granularity.ppc64-latest.err
diff --git a/tests/qemuxml2argvdata/ppc64-tpm-double.err b/tests/qemuxml2argvdata/ppc64-tpm-double.ppc64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/ppc64-tpm-double.err
rename to tests/qemuxml2argvdata/ppc64-tpm-double.ppc64-latest.err
diff --git a/tests/qemuxml2argvdata/ppc64-tpmproxy-double.err b/tests/qemuxml2argvdata/ppc64-tpmproxy-double.ppc64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/ppc64-tpmproxy-double.err
rename to tests/qemuxml2argvdata/ppc64-tpmproxy-double.ppc64-latest.err
diff --git a/tests/qemuxml2argvdata/pseries-no-parallel.err b/tests/qemuxml2argvdata/pseries-no-parallel.err
deleted file mode 100644
index 9c9eb69ae4..0000000000
--- a/tests/qemuxml2argvdata/pseries-no-parallel.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: The 'spapr-pci-host-bridge' device is not supported by this QEMU binary
diff --git a/tests/qemuxml2argvdata/pseries-no-parallel.ppc64-latest.err b/tests/qemuxml2argvdata/pseries-no-parallel.ppc64-latest.err
new file mode 100644
index 0000000000..619b19dc28
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-no-parallel.ppc64-latest.err
@@ -0,0 +1 @@
+unsupported configuration: parallel ports are not supported
diff --git a/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-1.err b/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-1.ppc64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pseries-phb-invalid-target-index-1.err
rename to tests/qemuxml2argvdata/pseries-phb-invalid-target-index-1.ppc64-latest.err
diff --git a/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-2.err b/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-2.ppc64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pseries-phb-invalid-target-index-2.err
rename to tests/qemuxml2argvdata/pseries-phb-invalid-target-index-2.ppc64-latest.err
diff --git a/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-3.err b/tests/qemuxml2argvdata/pseries-phb-invalid-target-index-3.ppc64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/pseries-phb-invalid-target-index-3.err
rename to tests/qemuxml2argvdata/pseries-phb-invalid-target-index-3.ppc64-latest.err
diff --git a/tests/qemuxml2argvdata/pseries-spaprvio-invalid.err b/tests/qemuxml2argvdata/pseries-spaprvio-invalid.err
deleted file mode 100644
index 9c9eb69ae4..0000000000
--- a/tests/qemuxml2argvdata/pseries-spaprvio-invalid.err
+++ /dev/null
@@ -1 +0,0 @@
-unsupported configuration: The 'spapr-pci-host-bridge' device is not supported by this QEMU binary
diff --git a/tests/qemuxml2argvdata/pseries-spaprvio-invalid.ppc64-latest.err b/tests/qemuxml2argvdata/pseries-spaprvio-invalid.ppc64-latest.err
new file mode 100644
index 0000000000..cadd19e2f2
--- /dev/null
+++ b/tests/qemuxml2argvdata/pseries-spaprvio-invalid.ppc64-latest.err
@@ -0,0 +1 @@
+unsupported configuration: spapr-vio reg='0x100000000' exceeds maximum possible value (0xffffffff)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 2ed3ae3cb7..4fada9725f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1964,7 +1964,7 @@ mymain(void)
DO_TEST_CAPS_LATEST_PPC64("pseries-nvram");
DO_TEST_CAPS_LATEST_PPC64("pseries-usb-kbd");
DO_TEST_CAPS_LATEST_PPC64("pseries-cpu-exact");
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-no-parallel");
+ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-no-parallel", "ppc64");
DO_TEST_CAPS_LATEST_PPC64("pseries-cpu-le");
qemuTestSetHostArch(&driver, VIR_ARCH_PPC64);
@@ -1990,9 +1990,9 @@ mymain(void)
DO_TEST_CAPS_LATEST_PPC64("pseries-phb-numa-node");
DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-default-phb-numa-node",
"ppc64");
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-phb-invalid-target-index-1");
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-phb-invalid-target-index-2");
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-phb-invalid-target-index-3");
+ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-phb-invalid-target-index-1", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-phb-invalid-target-index-2", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-phb-invalid-target-index-3", "ppc64");
DO_TEST_CAPS_LATEST_PPC64("pseries-many-devices");
DO_TEST_CAPS_LATEST_PPC64("pseries-many-buses-1");
@@ -2014,7 +2014,7 @@ mymain(void)
DO_TEST_CAPS_LATEST_PPC64("pseries-console-native");
DO_TEST_CAPS_LATEST_PPC64("pseries-console-virtio");
DO_TEST_PARSE_ERROR_NOCAPS("pseries-serial-invalid-machine");
- DO_TEST_PARSE_ERROR_NOCAPS("pseries-spaprvio-invalid");
+ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("pseries-spaprvio-invalid", "ppc64");
DO_TEST("mach-virt-serial-native",
QEMU_CAPS_DEVICE_PL011);
@@ -2463,8 +2463,7 @@ mymain(void)
QEMU_CAPS_KVM);
DO_TEST_PARSE_ERROR("aarch64-gic-not-virt",
QEMU_CAPS_KVM);
- DO_TEST_PARSE_ERROR("aarch64-gic-not-arm",
- QEMU_CAPS_KVM);
+ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("aarch64-gic-not-arm", "ppc64");
DO_TEST_CAPS_ARCH_LATEST("aarch64-kvm-32-on-64", "aarch64");
DO_TEST("aarch64-pci-serial",
QEMU_CAPS_DEVICE_PCI_SERIAL,
@@ -2607,17 +2606,8 @@ mymain(void)
ARG_CAPS_ARCH, "ppc64", ARG_CAPS_VER, "latest",
ARG_END);
- DO_TEST_PARSE_ERROR("ppc64-tpmproxy-double",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_PCI_OHCI,
- QEMU_CAPS_DEVICE_TPM_PASSTHROUGH,
- QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY);
-
- DO_TEST_PARSE_ERROR("ppc64-tpm-double",
- QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
- QEMU_CAPS_PCI_OHCI,
- QEMU_CAPS_DEVICE_TPM_PASSTHROUGH,
- QEMU_CAPS_DEVICE_SPAPR_TPM_PROXY);
+ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("ppc64-tpmproxy-double", "ppc64");
+ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("ppc64-tpm-double", "ppc64");
DO_TEST_CAPS_LATEST_PPC64("ppc64-tpmproxy-single");
DO_TEST_CAPS_LATEST_PPC64("ppc64-tpmproxy-with-tpm");
@@ -2661,8 +2651,7 @@ mymain(void)
DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-iommu-invalid-address");
DO_TEST("cpu-hotplug-startup", QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
- DO_TEST_PARSE_ERROR("cpu-hotplug-granularity",
- QEMU_CAPS_QUERY_HOTPLUGGABLE_CPUS);
+ DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("cpu-hotplug-granularity", "ppc64");
DO_TEST_CAPS_LATEST("virtio-options");
DO_TEST_CAPS_LATEST("virtio-options-controller-iommu");
--
2.39.2
More information about the libvir-list
mailing list