tests: Rename pseries-features-hpt test

We're going to use the same test case to exercise all optional
pSeries features, so a more generic name is needed.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>

diff --git a/tests/qemuxml2argvdata/pseries-features-hpt.args b/tests/qemuxml2argvdata/pseries-features.args
similarity index 100%
rename from tests/qemuxml2argvdata/pseries-features-hpt.args
rename to tests/qemuxml2argvdata/pseries-features.args

diff --git a/tests/qemuxml2argvdata/pseries-features-hpt.xml b/tests/qemuxml2argvdata/pseries-features.xml
similarity index 100%
rename from tests/qemuxml2argvdata/pseries-features-hpt.xml
rename to tests/qemuxml2argvdata/pseries-features.xml

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index f6a90c281459976dc396a1019592f7c5b25d6316..5ece3f0cc61497e500e25c7a82c08692554cb94d 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1915,11 +1915,11 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
 
-    DO_TEST("pseries-features-hpt",
+    DO_TEST("pseries-features",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
-    DO_TEST_FAILURE("pseries-features-hpt",
+    DO_TEST_FAILURE("pseries-features",
                     QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
                     QEMU_CAPS_MACHINE_OPT);
     DO_TEST_PARSE_ERROR("pseries-features-invalid-machine", NONE);

diff --git a/tests/qemuxml2xmloutdata/pseries-features-hpt.xml b/tests/qemuxml2xmloutdata/pseries-features-hpt.xml
deleted file mode 120000 (symlink)
index bcaf2e6..0000000
--- a/tests/qemuxml2xmloutdata/pseries-features-hpt.xml
+++ /dev/null
@@ -1 +0,0 @@
-../qemuxml2argvdata/pseries-features-hpt.xml
\ No newline at end of file

diff --git a/tests/qemuxml2xmloutdata/pseries-features.xml b/tests/qemuxml2xmloutdata/pseries-features.xml
new file mode 120000 (symlink)
index 0000000..1b01dba
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/pseries-features.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/pseries-features.xml
\ No newline at end of file

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 28ba46efb2bc1089df899367bdbe1c53b2be9405..f808608b6e05d93c6b9d279db818ec1634902e78 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -624,7 +624,7 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
 
-    DO_TEST("pseries-features-hpt",
+    DO_TEST("pseries-features",
             QEMU_CAPS_DEVICE_SPAPR_PCI_HOST_BRIDGE,
             QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);