From: Peter Krempa Date: Tue, 20 Feb 2024 14:44:00 +0000 (+0100) Subject: qemuxml2conftest: Consolidate usb controller tests for 'pseries' machine X-Git-Tag: v10.2.0-rc1~121 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c47e60fda9b18b6b40f7706dd0494fde8e71afac;p=thirdparty%2Flibvirt.git qemuxml2conftest: Consolidate usb controller tests for 'pseries' machine Move the test invocation and rename the test files according to the pattern. Signed-off-by: Peter Krempa Reviewed-by: Ján Tomko Reviewed-by: Andrea Bolognani --- diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.abi-update.args b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.args similarity index 100% rename from tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.abi-update.args rename to tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.args diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.abi-update.xml b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.xml similarity index 100% rename from tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.abi-update.xml rename to tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.abi-update.xml diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.args b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args similarity index 100% rename from tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.args rename to tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.args diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.xml b/tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.xml similarity index 100% rename from tests/qemuxmlconfdata/ppc64-usb-controller.ppc64-latest.xml rename to tests/qemuxmlconfdata/usb-controller-default-pseries.ppc64-latest.xml diff --git a/tests/qemuxmlconfdata/ppc64-usb-controller.xml b/tests/qemuxmlconfdata/usb-controller-default-pseries.xml similarity index 100% rename from tests/qemuxmlconfdata/ppc64-usb-controller.xml rename to tests/qemuxmlconfdata/usb-controller-default-pseries.xml diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c index f265b85327..a381060960 100644 --- a/tests/qemuxmlconftest.c +++ b/tests/qemuxmlconftest.c @@ -1851,6 +1851,8 @@ mymain(void) DO_TEST_CAPS_LATEST_PARSE_ERROR("usb-controller-default-isapc"); DO_TEST_CAPS_LATEST("usb-controller-default-i440fx"); DO_TEST_CAPS_LATEST("usb-controller-default-q35"); + DO_TEST_CAPS_ARCH_LATEST("usb-controller-default-pseries", "ppc64"); + DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("usb-controller-default-pseries", "ppc64"); /* i440fx downgrades to use '-usb' if the explicit controller is not present */ DO_TEST_FULL("usb-controller-default-unavailable-i440fx", ".x86_64-latest", ARG_CAPS_ARCH, "x86_64", @@ -2648,9 +2650,6 @@ mymain(void) DO_TEST_CAPS_LATEST("input-linux"); - DO_TEST_CAPS_ARCH_LATEST("ppc64-usb-controller", "ppc64"); - DO_TEST_CAPS_ARCH_LATEST_ABI_UPDATE("ppc64-usb-controller", "ppc64"); - DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("ppc64-tpmproxy-double", "ppc64"); DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("ppc64-tpm-double", "ppc64");