tests: Rename s390-usb-*

These tests currently cover the scenarios in which the guest
can end up with no USB controller, one of which is specific
to s390x. We are going to add more USB on s390x scenarios, so
a different naming convention is needed.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>

diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args
similarity index 100%
rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.args
rename to tests/qemuxmlconfdata/s390-usb-address.s390x-latest.args

diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.xml b/tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml
similarity index 100%
rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-usb-address.s390x-latest.xml

diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.xml b/tests/qemuxmlconfdata/s390-usb-address.xml
similarity index 100%
rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-controller.xml
rename to tests/qemuxmlconfdata/s390-usb-address.xml

diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.args b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args
similarity index 100%
rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.args
rename to tests/qemuxmlconfdata/s390-usb-none.s390x-latest.args

diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.xml b/tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml
similarity index 100%
rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-none.s390x-latest.xml
rename to tests/qemuxmlconfdata/s390-usb-none.s390x-latest.xml

diff --git a/tests/qemuxmlconfdata/s390-allow-bogus-usb-none.xml b/tests/qemuxmlconfdata/s390-usb-none.xml
similarity index 100%
rename from tests/qemuxmlconfdata/s390-allow-bogus-usb-none.xml
rename to tests/qemuxmlconfdata/s390-usb-none.xml

diff --git a/tests/qemuxmlconftest.c b/tests/qemuxmlconftest.c
index 0a27be77a8b47fe1a6e8e6c43ac8501a91011df6..4034d7f93864eb39e6a4dafa73dd8d955c1d0f3b 100644 (file)
--- a/tests/qemuxmlconftest.c
+++ b/tests/qemuxmlconftest.c
@@ -2319,8 +2319,8 @@ mymain(void)
     DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-rng-egd-crash");
     DO_TEST_CAPS_ARCH_LATEST("virtio-rng-ccw", "s390x");
 
-    DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-none", "s390x");
-    DO_TEST_CAPS_ARCH_LATEST("s390-allow-bogus-usb-controller", "s390x");
+    DO_TEST_CAPS_ARCH_LATEST("s390-usb-none", "s390x");
+    DO_TEST_CAPS_ARCH_LATEST("s390-usb-address", "s390x");
 
     DO_TEST_CAPS_ARCH_LATEST("s390-panic-no-address", "s390x");
     DO_TEST_CAPS_ARCH_LATEST_PARSE_ERROR("s390-panic-address", "s390x");