From f33f991185bccd22963c256437b9d8ea63361ff5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 13 Mar 2014 16:47:24 +0100 Subject: virtio-console-test: Test virtserialport as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit A test is only as good as its coverage - testing virtserialport in addition to virtconsole showed that commit 0399a3819b27083ba69b88a9baa9025facab85bd (virtio-console: QOM cast cleanup for VirtConsole) broke virtserialport. Acked-by: Richard W.M. Jones Signed-off-by: Andreas Färber --- tests/virtio-console-test.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/tests/virtio-console-test.c b/tests/virtio-console-test.c index f98f5af252..6be96e8c64 100644 --- a/tests/virtio-console-test.c +++ b/tests/virtio-console-test.c @@ -13,8 +13,18 @@ #include "qemu/osdep.h" /* Tests only initialization so far. TODO: Replace with functional tests */ -static void pci_nop(void) +static void console_pci_nop(void) { + qtest_start("-device virtio-serial-pci,id=vser0 " + "-device virtconsole,bus=vser0.0"); + qtest_end(); +} + +static void serialport_pci_nop(void) +{ + qtest_start("-device virtio-serial-pci,id=vser0 " + "-device virtserialport,bus=vser0.0"); + qtest_end(); } int main(int argc, char **argv) @@ -22,13 +32,10 @@ int main(int argc, char **argv) int ret; g_test_init(&argc, &argv, NULL); - qtest_add_func("/virtio/console/pci/nop", pci_nop); + qtest_add_func("/virtio/console/pci/nop", console_pci_nop); + qtest_add_func("/virtio/serialport/pci/nop", serialport_pci_nop); - qtest_start("-device virtio-serial-pci,id=vser0 " - "-device virtconsole,bus=vser0.0"); ret = g_test_run(); - qtest_end(); - return ret; } -- cgit v1.2.1