qtest: Use -display none by default

This avoids each test needing to add it to suppress windows popping up.

[Commit 7ceeedd016facf8d58e14a0d1417fa7225d71072 ("blockdev-test: add
test case for drive_add duplicate IDs") and commit
43cd209803d6cffb1e1a028c9ff2fd0ff4fce954 ("qdev-monitor-test: add
device_add leak test cases") added qtest tests without specifying
-display none.

As a result, "make check" now tries to use graphics (GTK or SDL).  Since
graphics are not used by the test and inappropriate for headless "make
check" runs, add the missing -display none.

This fixes "make check" in the QEMU buildbot.
-- Stefan]

Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>

diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
index da158c32bdd6444cf34e5fa800fb6e6f3de295f5..360a6911ebfe8573cdfef54a8ab76adbdb8d3e9b 100644 (file)
--- a/tests/boot-order-test.c
+++ b/tests/boot-order-test.c
@@ -34,7 +34,7 @@ static void test_a_boot_order(const char *machine,
     char *args;
     uint64_t actual;
 
-    args = g_strdup_printf("-nodefaults -display none%s%s %s",
+    args = g_strdup_printf("-nodefaults%s%s %s",
                            machine ? " -M " : "",
                            machine ?: "",
                            test_args);

diff --git a/tests/endianness-test.c b/tests/endianness-test.c
index 8719c0999cc33c08b71673099d957730c18cb2ff..646df7d8da3e29a29f4f7e104b8b62c0501346df 100644 (file)
--- a/tests/endianness-test.c
+++ b/tests/endianness-test.c
@@ -121,7 +121,7 @@ static void test_endianness(gconstpointer data)
     const TestCase *test = data;
     char *args;
 
-    args = g_strdup_printf("-display none -M %s%s%s -device pc-testdev",
+    args = g_strdup_printf("-M %s%s%s -device pc-testdev",
                            test->machine,
                            test->superio ? " -device " : "",
                            test->superio ?: "");
@@ -196,7 +196,7 @@ static void test_endianness_split(gconstpointer data)
     const TestCase *test = data;
     char *args;
 
-    args = g_strdup_printf("-display none -M %s%s%s -device pc-testdev",
+    args = g_strdup_printf("-M %s%s%s -device pc-testdev",
                            test->machine,
                            test->superio ? " -device " : "",
                            test->superio ?: "");
@@ -243,7 +243,7 @@ static void test_endianness_combine(gconstpointer data)
     const TestCase *test = data;
     char *args;
 
-    args = g_strdup_printf("-display none -M %s%s%s -device pc-testdev",
+    args = g_strdup_printf("-M %s%s%s -device pc-testdev",
                            test->machine,
                            test->superio ? " -device " : "",
                            test->superio ?: "");

diff --git a/tests/fw_cfg-test.c b/tests/fw_cfg-test.c
index b86e49ab09e8ab07b99c29480201dc061f871815..e4f355ce3f6a221299cb24e72534389485bec103 100644 (file)
--- a/tests/fw_cfg-test.c
+++ b/tests/fw_cfg-test.c
@@ -126,8 +126,7 @@ int main(int argc, char **argv)
     g_test_add_func("/fw_cfg/numa", test_fw_cfg_numa);
     g_test_add_func("/fw_cfg/boot_menu", test_fw_cfg_boot_menu);
 
-    cmdline = g_strdup_printf("-display none "
-                              "-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 ");
+    cmdline = g_strdup_printf("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 ");
     s = qtest_start(cmdline);
     g_free(cmdline);
 

diff --git a/tests/hd-geo-test.c b/tests/hd-geo-test.c
index b72042e59d49ebddcafd15081b87f530036fd443..c84d1e75e029d48dd58105740d3508976d5643b9 100644 (file)
--- a/tests/hd-geo-test.c
+++ b/tests/hd-geo-test.c
@@ -171,7 +171,7 @@ static int setup_common(char *argv[], int argv_sz)
 {
     memset(cur_ide, 0, sizeof(cur_ide));
     return append_arg(0, argv, argv_sz,
-                      g_strdup("-nodefaults -display none"));
+                      g_strdup("-nodefaults"));
 }
 
 static void setup_mbr(int img_idx, MBRcontents mbr)

diff --git a/tests/i440fx-test.c b/tests/i440fx-test.c
index 08ce820ebd0a17d2cb32e4fe867c03596d1332ee..65c786ca1e334653781405a81823969fd07c7eef 100644 (file)
--- a/tests/i440fx-test.c
+++ b/tests/i440fx-test.c
@@ -265,7 +265,7 @@ int main(int argc, char **argv)
 
     data.num_cpus = 1;
 
-    cmdline = g_strdup_printf("-display none -smp %d", data.num_cpus);
+    cmdline = g_strdup_printf("-smp %d", data.num_cpus);
     s = qtest_start(cmdline);
     g_free(cmdline);
 

diff --git a/tests/libqtest.c b/tests/libqtest.c
index 83424c3c6b69975c702bb9a5a5241035b41f57c0..359d571a0601d1962aef46540f95f42d5c7e300f 100644 (file)
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -135,6 +135,7 @@ QTestState *qtest_init(const char *extra_args)
                                   "-qmp unix:%s,nowait "
                                   "-pidfile %s "
                                   "-machine accel=qtest "
+                                  "-display none "
                                   "%s", qemu_binary, s->socket_path,
                                   s->qmp_socket_path, pid_file,
                                   extra_args ?: "");

diff --git a/tests/m48t59-test.c b/tests/m48t59-test.c
index 4081a5fdb2078475ea738caab701df7e63bfd280..6abc4c8bf0e4607accc58c23ec6d2c35ea19e477 100644 (file)
--- a/tests/m48t59-test.c
+++ b/tests/m48t59-test.c
@@ -249,7 +249,7 @@ int main(int argc, char **argv)
 
     g_test_init(&argc, &argv, NULL);
 
-    s = qtest_start("-display none -rtc clock=vm");
+    s = qtest_start("-rtc clock=vm");
 
     qtest_add_func("/rtc/bcd/check-time", bcd_check_time);
     qtest_add_func("/rtc/fuzz-registers", fuzz_registers);

diff --git a/tests/qom-test.c b/tests/qom-test.c
index 6ed23c5e542c27399f74ead0df795aff13a70e51..499be40261ce5ccaf2e7ce473dc3f77dc1699102 100644 (file)
--- a/tests/qom-test.c
+++ b/tests/qom-test.c
@@ -18,7 +18,7 @@ static void test_nop(gconstpointer data)
     const char *machine = data;
     char *args;
 
-    args = g_strdup_printf("-display none -machine %s", machine);
+    args = g_strdup_printf("-machine %s", machine);
     s = qtest_start(args);
     if (s) {
         qtest_quit(s);

diff --git a/tests/rtc-test.c b/tests/rtc-test.c
index 3395d7f50bc7616a577df9eb2f75a7b46f9c6edd..f1b123fae1b829295fd8c6ad1f06a9b5ea70bc14 100644 (file)
--- a/tests/rtc-test.c
+++ b/tests/rtc-test.c
@@ -552,7 +552,7 @@ int main(int argc, char **argv)
 
     g_test_init(&argc, &argv, NULL);
 
-    s = qtest_start("-display none -rtc clock=vm");
+    s = qtest_start("-rtc clock=vm");
     qtest_irq_intercept_in(s, "ioapic");
 
     qtest_add_func("/rtc/check-time/bcd", bcd_check_time);

diff --git a/tests/tmp105-test.c b/tests/tmp105-test.c
index fecd6dcd7091df551974db2b37de7df5eb7edd87..5ac48e2f5c332452f3637a1d28a27f8c991d9bac 100644 (file)
--- a/tests/tmp105-test.c
+++ b/tests/tmp105-test.c
@@ -59,7 +59,7 @@ int main(int argc, char **argv)
 
     g_test_init(&argc, &argv, NULL);
 
-    s = qtest_start("-display none -machine n800");
+    s = qtest_start("-machine n800");
     i2c = omap_i2c_create(OMAP2_I2C_1_BASE);
     addr = N8X0_ADDR;