1. Patchew
  2. Libvirt
  3. [libvirt] [PATCH 00/11] Fixes and improvements to feature handling
  4. View patch

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

Andrea Bolognani posted 11 patches 8 years ago
[libvirt] [PATCH 07/11] tests: Improve GIC tests
Posted by Andrea Bolognani 8 years ago 
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 <abologna@redhat.com>
---
 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 120000 tests/qemuxml2argvdata/aarch64-gic-default-both.args
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-both.xml
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v2.args
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v2.xml
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v3.args
 create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v3.xml
 create mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml
 create mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml
 create mode 120000 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 120000
index 000000000..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 120000
index 000000000..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 120000
index 000000000..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 120000
index 000000000..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 120000
index 000000000..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 120000
index 000000000..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 120000
index 000000000..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 120000
index 000000000..ee470fb1f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml b/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml
new file mode 120000
index 000000000..ee470fb1f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-default-v3.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/aarch64-gic-v2.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index d3544a1ef..83809574c 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1265,9 +1265,9 @@ mymain(void)
     DO_TEST_FULL("aarch64-gic-none-both", WHEN_BOTH, GIC_BOTH, NONE);
     DO_TEST_FULL("aarch64-gic-none-tcg", WHEN_BOTH, GIC_BOTH, NONE);
     DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_NONE, NONE);
-    DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V2, NONE);
-    DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_V3, NONE);
-    DO_TEST_FULL("aarch64-gic-default", WHEN_BOTH, GIC_BOTH, NONE);
+    DO_TEST_FULL("aarch64-gic-default-v2", WHEN_BOTH, GIC_V2, NONE);
+    DO_TEST_FULL("aarch64-gic-default-v3", WHEN_BOTH, GIC_V3, NONE);
+    DO_TEST_FULL("aarch64-gic-default-both", WHEN_BOTH, GIC_BOTH, NONE);
     DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_NONE, NONE);
     DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V2, NONE);
     DO_TEST_FULL("aarch64-gic-v2", WHEN_BOTH, GIC_V3, NONE);
-- 
2.14.3

--
libvir-list mailing list
libvir-list@redhat.com
https://www.redhat.com/mailman/listinfo/libvir-list
Re: [libvirt] [PATCH 07/11] tests: Improve GIC tests
Posted by John Ferlan 7 years, 12 months ago 

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 <abologna@redhat.com>
> ---
>  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 120000 tests/qemuxml2argvdata/aarch64-gic-default-both.args
>  create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-both.xml
>  create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v2.args
>  create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v2.xml
>  create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v3.args
>  create mode 120000 tests/qemuxml2argvdata/aarch64-gic-default-v3.xml
>  create mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-both.xml
>  create mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-v2.xml
>  create mode 120000 tests/qemuxml2xmloutdata/aarch64-gic-default-v3.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

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.