[PATCH 15/25] 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 <pkrempa(a)redhat.com>
---
...-controller-default-pseries.ppc64-latest.abi-update.args} | 0
...b-controller-default-pseries.ppc64-latest.abi-update.xml} | 0
...args => usb-controller-default-pseries.ppc64-latest.args} | 0
...t.xml => usb-controller-default-pseries.ppc64-latest.xml} | 0
...usb-controller.xml => usb-controller-default-pseries.xml} | 0
tests/qemuxmlconftest.c | 5 ++---
6 files changed, 2 insertions(+), 3 deletions(-)
rename tests/qemuxmlconfdata/{ppc64-usb-controller.ppc64-latest.abi-update.args =>
usb-controller-default-pseries.ppc64-latest.abi-update.args} (100%)
rename tests/qemuxmlconfdata/{ppc64-usb-controller.ppc64-latest.abi-update.xml =>
usb-controller-default-pseries.ppc64-latest.abi-update.xml} (100%)
rename tests/qemuxmlconfdata/{ppc64-usb-controller.ppc64-latest.args =>
usb-controller-default-pseries.ppc64-latest.args} (100%)
rename tests/qemuxmlconfdata/{ppc64-usb-controller.ppc64-latest.xml =>
usb-controller-default-pseries.ppc64-latest.xml} (100%)
rename tests/qemuxmlconfdata/{ppc64-usb-controller.xml =>
usb-controller-default-pseries.xml} (100%)
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 f250fd1ff1..f78596c45e 100644
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -1853,6 +1853,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",
@@ -2650,9 +2652,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");
--
2.43.0