From: Andreas Färber <afaer...@suse.de>
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 <afaer...@suse.de>
Signed-off-by: Stefan Hajnoczi <stefa...@redhat.com>
---
tests/boot-order-test.c | 2 +-
tests/endianness-test.c | 6 +++---
tests/fw_cfg-test.c | 3 +--
tests/hd-geo-test.c | 2 +-
tests/i440fx-test.c | 2 +-
tests/libqtest.c | 1 +
tests/m48t59-test.c | 2 +-
tests/qom-test.c | 2 +-
tests/rtc-test.c | 2 +-
tests/tmp105-test.c | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/boot-order-test.c b/tests/boot-order-test.c
index da158c3..360a691 100644
--- 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 8719c09..646df7d 100644
--- 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 b86e49a..e4f355c 100644
--- 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 b72042e..c84d1e7 100644
--- 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 08ce820..65c786c 100644
--- 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 83424c3..359d571 100644
--- 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 4081a5f..6abc4c8 100644
--- 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 6ed23c5..499be40 100644
--- 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 3395d7f..f1b123f 100644
--- 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 fecd6dc..5ac48e2 100644
--- 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;
--
1.8.4.2
