ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: skip dbus-display tests that need a console 

When compiling with "configure --without-default-devices", the
dbus-display-test fails since it implicitly assumes that the
machine comes with a default console.

There doesn't seem to be an easy way to figure this during build time,
so skip the tests requiring the Console interface at runtime.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-ID: <20240221073759.171443-1-marcandre.lureau@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Marc-André Lureau 2024-02-21 11:37:59 +04:00 committed by Thomas Huth
parent 1172428fb1
commit 0e9a89193d
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/qtest/dbus-display-test.c
View File

@ -135,6 +135,13 @@ test_dbus_console_registered(GObject *source_object,
NULL, NULL,
#endif #endif
res, &err); res, &err);
if (g_error_matches(err, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) {
g_test_skip("The VM doesn't have a console!");
g_main_loop_quit(test->loop);
return;
}
g_assert_no_error(err); g_assert_no_error(err);
test->listener_conn = g_thread_join(test->thread); test->listener_conn = g_thread_join(test->thread);
@ -156,7 +163,7 @@ test_dbus_display_console(void)
g_autoptr(GMainLoop) loop = NULL; g_autoptr(GMainLoop) loop = NULL;
QTestState *qts = NULL; QTestState *qts = NULL;
int pair[2]; int pair[2];
TestDBusConsoleRegister test; TestDBusConsoleRegister test = { 0, };
#ifdef WIN32 #ifdef WIN32
WSAPROTOCOL_INFOW info; WSAPROTOCOL_INFOW info;
g_autoptr(GVariant) listener = NULL; g_autoptr(GVariant) listener = NULL;
@ -245,7 +252,6 @@ test_dbus_display_keyboard(void)
&err)); &err));
g_assert_no_error(err); g_assert_no_error(err);
g_assert_cmpint(qtest_inb(qts, 0x64) & 0x1, ==, 0); g_assert_cmpint(qtest_inb(qts, 0x64) & 0x1, ==, 0);
g_assert_cmpint(qtest_inb(qts, 0x60), ==, 0); g_assert_cmpint(qtest_inb(qts, 0x60), ==, 0);
@ -256,6 +262,12 @@ test_dbus_display_keyboard(void)
-1, -1,
NULL, NULL,
&err); &err);
if (g_error_matches(err, G_DBUS_ERROR, G_DBUS_ERROR_UNKNOWN_METHOD)) {
g_test_skip("The VM doesn't have a console!");
qtest_quit(qts);
return;
}
g_assert_no_error(err); g_assert_no_error(err);
/* may be should wait for interrupt? */ /* may be should wait for interrupt? */