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>
---
 .../{pseries-features-hpt.args => pseries-features.args}              | 0
 .../{pseries-features-hpt.xml => pseries-features.xml}                | 0
 tests/qemuxml2argvtest.c                                              | 4 ++--
 tests/qemuxml2xmloutdata/pseries-features-hpt.xml                     | 1 -
 tests/qemuxml2xmloutdata/pseries-features.xml                         | 1 +
 tests/qemuxml2xmltest.c                                               | 2 +-
 6 files changed, 4 insertions(+), 4 deletions(-)
 rename tests/qemuxml2argvdata/{pseries-features-hpt.args => pseries-features.args} (100%)
 rename tests/qemuxml2argvdata/{pseries-features-hpt.xml => pseries-features.xml} (100%)
 delete mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml
 create mode 120000 tests/qemuxml2xmloutdata/pseries-features.xml

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 688846b9b4..ca53912ebe 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1896,10 +1896,10 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
 
-    DO_TEST("pseries-features-hpt",
+    DO_TEST("pseries-features",
             QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
-    DO_TEST_FAILURE("pseries-features-hpt",
+    DO_TEST_FAILURE("pseries-features",
                     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
index bcaf2e6fec..0000000000
--- 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
index 0000000000..1b01dbace6
--- /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 0eb9e6c77a..a363b55446 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -763,7 +763,7 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI,
             QEMU_CAPS_DEVICE_VFIO_PCI);
 
-    DO_TEST("pseries-features-hpt",
+    DO_TEST("pseries-features",
             QEMU_CAPS_MACHINE_OPT,
             QEMU_CAPS_MACHINE_PSERIES_RESIZE_HPT);
 
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On Fri, 2018-03-09 at 16:07 +0100, Andrea Bolognani wrote:
> 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>
> ---
>  .../{pseries-features-hpt.args => pseries-features.args}              | 0
>  .../{pseries-features-hpt.xml => pseries-features.xml}                | 0
>  tests/qemuxml2argvtest.c                                              | 4 ++--
>  tests/qemuxml2xmloutdata/pseries-features-hpt.xml                     | 1 -
>  tests/qemuxml2xmloutdata/pseries-features.xml                         | 1 +
>  tests/qemuxml2xmltest.c                                               | 2 +-
>  6 files changed, 4 insertions(+), 4 deletions(-)
>  rename tests/qemuxml2argvdata/{pseries-features-hpt.args => pseries-features.args} (100%)
>  rename tests/qemuxml2argvdata/{pseries-features-hpt.xml => pseries-features.xml} (100%)
>  delete mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml
>  create mode 120000 tests/qemuxml2xmloutdata/pseries-features.xml

This does no longer apply cleanly now that 07160b65db94 has been
pushed, but the conflict is trivial.

At any rate, I've updated the GitHub branch so that it's based on
b9b9195f15c9 instead of 90d7262552e8, which means anyone fetching
from there won't have to deal with the conflict at all.

-- 
Andrea Bolognani / Red Hat / Virtualization

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list

On 03/09/2018 10:07 AM, Andrea Bolognani wrote:
> 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>
> ---
>  .../{pseries-features-hpt.args => pseries-features.args}              | 0
>  .../{pseries-features-hpt.xml => pseries-features.xml}                | 0
>  tests/qemuxml2argvtest.c                                              | 4 ++--
>  tests/qemuxml2xmloutdata/pseries-features-hpt.xml                     | 1 -
>  tests/qemuxml2xmloutdata/pseries-features.xml                         | 1 +
>  tests/qemuxml2xmltest.c                                               | 2 +-
>  6 files changed, 4 insertions(+), 4 deletions(-)
>  rename tests/qemuxml2argvdata/{pseries-features-hpt.args => pseries-features.args} (100%)
>  rename tests/qemuxml2argvdata/{pseries-features-hpt.xml => pseries-features.xml} (100%)
>  delete mode 120000 tests/qemuxml2xmloutdata/pseries-features-hpt.xml
>  create mode 120000 tests/qemuxml2xmloutdata/pseries-features.xml
> 

Reviewed-by: John Ferlan <jferlan@redhat.com>

John

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list