Re: [libvirt] [PATCH 07/11] tests: Improve GIC tests

[John Ferlan]

On 02/06/2018 11:42 AM, Andrea Bolognani wrote:
> Account for the fact that the default might change based on what
> GIC versions are supported by QEMU. That's not the case at the
> moment, but it will be soon.
> 
> Signed-off-by: Andrea Bolognani 
> ---
>  tests/qemuxml2argvdata/aarch64-gic-default-both.args  | 1 +
>  tests/qemuxml2argvdata/aarch64-gic-default-both.xml   | 1 +
>  tests/qemuxml2argvdata/aarch64-gic-default-v2.args| 1 +
>  tests/qemuxml2argvdata/aarch64-gic-default-v2.xml | 1 +
>  tests/qemuxml2argvdata/aarch64-gic-default-v3.args| 1 +
>  tests/qemuxml2argvdata/aarch64-gic-default-v3.xml | 1 +
>  tests/qemuxml2argvtest.c  | 6 +++---
>  tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml | 1 +
>  tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml   | 1 +
>  tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml   | 1 +
>  tests/qemuxml2xmltest.c   | 6 +++---
>  11 files changed, 15 insertions(+), 6 deletions(-)
>  create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-both.args
>  create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-both.xml
>  create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-v2.args
>  create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-v2.xml
>  create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-v3.args
>  create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-v3.xml
>  create mode 12 tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml
>  create mode 12 tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml
>  create mode 12 tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml
> 

Reviewed-by: John Ferlan 

John

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

[libvirt] [PATCH 07/11] tests: Improve GIC tests

[Andrea Bolognani]

Account for the fact that the default might change based on what
GIC versions are supported by QEMU. That's not the case at the
moment, but it will be soon.

Signed-off-by: Andrea Bolognani 
---
 tests/qemuxml2argvdata/aarch64-gic-default-both.args  | 1 +
 tests/qemuxml2argvdata/aarch64-gic-default-both.xml   | 1 +
 tests/qemuxml2argvdata/aarch64-gic-default-v2.args| 1 +
 tests/qemuxml2argvdata/aarch64-gic-default-v2.xml | 1 +
 tests/qemuxml2argvdata/aarch64-gic-default-v3.args| 1 +
 tests/qemuxml2argvdata/aarch64-gic-default-v3.xml | 1 +
 tests/qemuxml2argvtest.c  | 6 +++---
 tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml | 1 +
 tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml   | 1 +
 tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml   | 1 +
 tests/qemuxml2xmltest.c   | 6 +++---
 11 files changed, 15 insertions(+), 6 deletions(-)
 create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-both.args
 create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-both.xml
 create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-v2.args
 create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-v2.xml
 create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-v3.args
 create mode 12 tests/qemuxml2argvdata/aarch64-gic-default-v3.xml
 create mode 12 tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml
 create mode 12 tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml
 create mode 12 tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml

diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args 
b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
new file mode 12
index 0..04ecd4ce7
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
@@ -0,0 +1 @@
+aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.xml 
b/tests/qemuxml2argvdata/aarch64-gic-default-both.xml
new file mode 12
index 0..3e2183c92
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.xml
@@ -0,0 +1 @@
+aarch64-gic-default.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args 
b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
new file mode 12
index 0..04ecd4ce7
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
@@ -0,0 +1 @@
+aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.xml 
b/tests/qemuxml2argvdata/aarch64-gic-default-v2.xml
new file mode 12
index 0..3e2183c92
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.xml
@@ -0,0 +1 @@
+aarch64-gic-default.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args 
b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
new file mode 12
index 0..04ecd4ce7
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
@@ -0,0 +1 @@
+aarch64-gic-v2.args
\ No newline at end of file
diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.xml 
b/tests/qemuxml2argvdata/aarch64-gic-default-v3.xml
new file mode 12
index 0..3e2183c92
--- /dev/null
+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.xml
@@ -0,0 +1 @@
+aarch64-gic-default.xml
\ No newline at end of file
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b7afb6980..dd64772e2 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2602,13 +2602,13 @@ mymain(void)
 DO_TEST_GIC("aarch64-gic-default", GIC_NONE,
 QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
 QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-DO_TEST_GIC("aarch64-gic-default", GIC_V2,
+DO_TEST_GIC("aarch64-gic-default-v2", GIC_V2,
 QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
 QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-DO_TEST_GIC("aarch64-gic-default", GIC_V3,
+DO_TEST_GIC("aarch64-gic-default-v3", GIC_V3,
 QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
 QEMU_CAPS_MACH_VIRT_GIC_VERSION);
-DO_TEST_GIC("aarch64-gic-default", GIC_BOTH,
+DO_TEST_GIC("aarch64-gic-default-both", GIC_BOTH,
 QEMU_CAPS_KVM, QEMU_CAPS_MACHINE_OPT,
 QEMU_CAPS_MACH_VIRT_GIC_VERSION);
 DO_TEST_GIC("aarch64-gic-v2", GIC_NONE,
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml 
b/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml
new file mode 12
index 0..ee470fb1f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml 
b/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml
new file mode 12
index 0..ee470fb1f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml
@@ -0,0 +1 @@