qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH] build-sys: fix make check with --disable-vnc


From: Marc-André Lureau
Subject: [Qemu-devel] [PATCH] build-sys: fix make check with --disable-vnc
Date: Fri, 12 Aug 2016 21:02:59 +0400

Signed-off-by: Marc-André Lureau <address@hidden>
---
 tests/ide-test.c      | 2 ++
 tests/ipmi-bt-test.c  | 5 ++++-
 tests/ipmi-kcs-test.c | 8 ++++++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/tests/ide-test.c b/tests/ide-test.c
index 1e51af2..f6e10ad 100644
--- a/tests/ide-test.c
+++ b/tests/ide-test.c
@@ -582,7 +582,9 @@ static void test_retry_flush(const char *machine)
     prepare_blkdebug_script(debug_path, "flush_to_disk");
 
     ide_test_start(
+#ifdef CONFIG_VNC
         "-vnc none "
+#endif
         "-drive file=blkdebug:%s:%s,if=ide,cache=writeback,format=raw,"
         "rerror=stop,werror=stop",
         debug_path, tmp_path);
diff --git a/tests/ipmi-bt-test.c b/tests/ipmi-bt-test.c
index be9005e..40d456a 100644
--- a/tests/ipmi-bt-test.c
+++ b/tests/ipmi-bt-test.c
@@ -415,7 +415,10 @@ int main(int argc, char **argv)
     /* Run the tests */
     g_test_init(&argc, &argv, NULL);
 
-    cmdline = g_strdup_printf("-vnc none"
+    cmdline = g_strdup_printf(
+#ifdef CONFIG_VNC
+          "-vnc none"
+#endif
           " -chardev socket,id=ipmi0,host=localhost,port=%d,reconnect=10"
           " -device ipmi-bmc-extern,chardev=ipmi0,id=bmc0"
           " -device isa-ipmi-bt,bmc=bmc0", emu_port);
diff --git a/tests/ipmi-kcs-test.c b/tests/ipmi-kcs-test.c
index 3750389..451feb3 100644
--- a/tests/ipmi-kcs-test.c
+++ b/tests/ipmi-kcs-test.c
@@ -276,8 +276,12 @@ int main(int argc, char **argv)
     /* Run the tests */
     g_test_init(&argc, &argv, NULL);
 
-    cmdline = g_strdup_printf("-vnc none -device ipmi-bmc-sim,id=bmc0"
-                              " -device isa-ipmi-kcs,bmc=bmc0");
+    cmdline = g_strdup_printf(
+#ifdef CONFIG_VNC
+        "-vnc none"
+#endif
+        " -device ipmi-bmc-sim,id=bmc0"
+        " -device isa-ipmi-kcs,bmc=bmc0");
     qtest_start(cmdline);
     qtest_irq_intercept_in(global_qtest, "ioapic");
     qtest_add_func("/ipmi/local/kcs_base", test_kcs_base);
-- 
2.9.0




reply via email to

[Prev in Thread] Current Thread [Next in Thread]