From: Thomas Huth <thuth@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Peter Maydell" <peter.maydell@linaro.org>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PULL 04/11] tests: skip dbus-display tests that need a console
Date: Fri, 23 Feb 2024 20:09:56 +0100 [thread overview]
Message-ID: <20240223191003.6268-5-thuth@redhat.com> (raw)
In-Reply-To: <20240223191003.6268-1-thuth@redhat.com>
From: Marc-André Lureau <marcandre.lureau@redhat.com>
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>
---
tests/qtest/dbus-display-test.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/tests/qtest/dbus-display-test.c b/tests/qtest/dbus-display-test.c
index 21edaa1e32..0390bdcb41 100644
--- a/tests/qtest/dbus-display-test.c
+++ b/tests/qtest/dbus-display-test.c
@@ -135,6 +135,13 @@ test_dbus_console_registered(GObject *source_object,
NULL,
#endif
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);
test->listener_conn = g_thread_join(test->thread);
@@ -156,7 +163,7 @@ test_dbus_display_console(void)
g_autoptr(GMainLoop) loop = NULL;
QTestState *qts = NULL;
int pair[2];
- TestDBusConsoleRegister test;
+ TestDBusConsoleRegister test = { 0, };
#ifdef WIN32
WSAPROTOCOL_INFOW info;
g_autoptr(GVariant) listener = NULL;
@@ -245,7 +252,6 @@ test_dbus_display_keyboard(void)
&err));
g_assert_no_error(err);
-
g_assert_cmpint(qtest_inb(qts, 0x64) & 0x1, ==, 0);
g_assert_cmpint(qtest_inb(qts, 0x60), ==, 0);
@@ -256,6 +262,12 @@ test_dbus_display_keyboard(void)
-1,
NULL,
&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);
/* may be should wait for interrupt? */
--
2.43.2
next prev parent reply other threads:[~2024-02-23 19:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-23 19:09 [PULL 00/11] Test and misc patches Thomas Huth
2024-02-23 19:09 ` [PULL 01/11] target/m68k: Fix exception frame format for 68010 Thomas Huth
2024-02-23 19:09 ` [PULL 02/11] tests/cdrom-test: Add cdrom test for LoongArch virt machine Thomas Huth
2024-02-23 19:09 ` [PULL 03/11] tests/qtest: Fix boot-serial-test when using --without-default-devices Thomas Huth
2024-02-23 19:09 ` Thomas Huth [this message]
2024-02-23 19:09 ` [PULL 05/11] target/ppc/kvm: Replace variable length array in kvmppc_save_htab() Thomas Huth
2024-02-23 19:09 ` [PULL 06/11] target/ppc/kvm: Replace variable length array in kvmppc_read_hptes() Thomas Huth
2024-02-23 19:09 ` [PULL 07/11] meson: Enable -Wvla Thomas Huth
2024-02-23 19:10 ` [PULL 08/11] docs: Document that 32-bit Windows is unsupported Thomas Huth
2024-02-23 19:10 ` [PULL 09/11] .gitlab-ci.d: Drop cross-win32-system job Thomas Huth
2024-02-23 19:10 ` [PULL 10/11] .gitlab-ci.d/windows.yml: Remove shared-msys2 abstraction Thomas Huth
2024-02-23 19:10 ` [PULL 11/11] target/i386: do not filter processor tracing features except on KVM Thomas Huth
2024-02-25 11:52 ` [PULL 00/11] Test and misc patches Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240223191003.6268-5-thuth@redhat.com \
--to=thuth@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).