[Qemu-devel] [PATCH 12/14] check: Only test virtio-gpu when it is compiled in

[Juan Quintela]

Signed-off-by: Juan Quintela <address@hidden>
---
 tests/Makefile.include   | 4 ++--
 tests/display-vga-test.c | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile.include b/tests/Makefile.include
index a9cb5e926b..c4d68061e5 100644
--- a/tests/Makefile.include
+++ b/tests/Makefile.include
@@ -238,8 +238,8 @@ check-qtest-pci-y += tests/display-vga-test$(EXESUF)
 gcov-files-pci-y += hw/display/vga.c
 gcov-files-pci-y += hw/display/cirrus_vga.c
 gcov-files-pci-y += hw/display/vga-pci.c
-gcov-files-pci-y += hw/display/virtio-gpu.c
-gcov-files-pci-y += hw/display/virtio-gpu-pci.c
+gcov-files-pci-$(CONFIG_VIRTIO_GPU) += hw/display/virtio-gpu.c
+gcov-files-pci-$(CONFIG_VIRTIO_GPU) += hw/display/virtio-gpu-pci.c
 gcov-files-pci-$(CONFIG_VIRTIO_VGA) += hw/display/virtio-vga.c
 check-qtest-pci-$(CONFIG_HDA) += tests/intel-hda-test$(EXESUF)
 gcov-files-pci-$(CONFIG_HDA) += hw/audio/intel-hda.c hw/audio/hda-codec.c
diff --git a/tests/display-vga-test.c b/tests/display-vga-test.c
index 2d7d24eee0..b716e70a4b 100644
--- a/tests/display-vga-test.c
+++ b/tests/display-vga-test.c
@@ -34,11 +34,13 @@ static void pci_multihead(void)
     qtest_end();
 }
 
+#ifdef CONFIG_VIRTIO_GPU
 static void pci_virtio_gpu(void)
 {
     qtest_start("-vga none -device virtio-gpu-pci");
     qtest_end();
 }
+#endif
 
 #ifdef CONFIG_VIRTIO_VGA
 static void pci_virtio_vga(void)
@@ -61,7 +63,9 @@ int main(int argc, char **argv)
     qtest_add_func("/display/pci/stdvga", pci_stdvga);
     qtest_add_func("/display/pci/secondary", pci_secondary);
     qtest_add_func("/display/pci/multihead", pci_multihead);
+#ifdef CONFIG_VIRTIO_GPU
     qtest_add_func("/display/pci/virtio-gpu", pci_virtio_gpu);
+#endif
 #ifdef CONFIG_VIRTIO_VGA
     qtest_add_func("/display/pci/virtio-vga", pci_virtio_vga);
 #endif
-- 
2.17.1