提交 2df35773 编写于 作者: E Eduardo Habkost

tests: Remove unneeded "-vnc none" option

Some tests use the "-vnc none" option without any clear reason,
making those tests break when --disable-vnc is specified on
./configure.  Remove the unnecessary option.
Reviewed-by: NJohn Snow <jsnow@redhat.com>
Tested-by: NCorey Minyard <cminyard@mvista.com>
Reviewed-by: NMichael S. Tsirkin <mst@redhat.com>
Acked-by: NKevin Wolf <kwolf@redhat.com>
Signed-off-by: NEduardo Habkost <ehabkost@redhat.com>
上级 6bc56d31
...@@ -620,7 +620,6 @@ static void test_retry_flush(const char *machine) ...@@ -620,7 +620,6 @@ static void test_retry_flush(const char *machine)
prepare_blkdebug_script(debug_path, "flush_to_disk"); prepare_blkdebug_script(debug_path, "flush_to_disk");
ide_test_start( ide_test_start(
"-vnc none "
"-drive file=blkdebug:%s:%s,if=ide,cache=writeback,format=raw," "-drive file=blkdebug:%s:%s,if=ide,cache=writeback,format=raw,"
"rerror=stop,werror=stop", "rerror=stop,werror=stop",
debug_path, tmp_path); debug_path, tmp_path);
......
...@@ -415,7 +415,7 @@ int main(int argc, char **argv) ...@@ -415,7 +415,7 @@ int main(int argc, char **argv)
/* Run the tests */ /* Run the tests */
g_test_init(&argc, &argv, NULL); g_test_init(&argc, &argv, NULL);
cmdline = g_strdup_printf("-vnc none" cmdline = g_strdup_printf(
" -chardev socket,id=ipmi0,host=localhost,port=%d,reconnect=10" " -chardev socket,id=ipmi0,host=localhost,port=%d,reconnect=10"
" -device ipmi-bmc-extern,chardev=ipmi0,id=bmc0" " -device ipmi-bmc-extern,chardev=ipmi0,id=bmc0"
" -device isa-ipmi-bt,bmc=bmc0", emu_port); " -device isa-ipmi-bt,bmc=bmc0", emu_port);
......
...@@ -276,7 +276,7 @@ int main(int argc, char **argv) ...@@ -276,7 +276,7 @@ int main(int argc, char **argv)
/* Run the tests */ /* Run the tests */
g_test_init(&argc, &argv, NULL); g_test_init(&argc, &argv, NULL);
cmdline = g_strdup_printf("-vnc none -device ipmi-bmc-sim,id=bmc0" cmdline = g_strdup_printf("-device ipmi-bmc-sim,id=bmc0"
" -device isa-ipmi-kcs,bmc=bmc0"); " -device isa-ipmi-kcs,bmc=bmc0");
qtest_start(cmdline); qtest_start(cmdline);
qtest_irq_intercept_in(global_qtest, "ioapic"); qtest_irq_intercept_in(global_qtest, "ioapic");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册