diff options
author | Julia Suvorova <jusual@mail.ru> | 2019-01-29 11:46:04 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2019-01-29 11:46:04 +0000 |
commit | 6c90a82c9358c77017b94d67c1a3fa24e0500e07 (patch) | |
tree | e046933dc8db77562af829edd6d4bcda93d76c72 | |
parent | 047be4ed24b3a408acccf9316d619477c06cca42 (diff) | |
download | qemu-6c90a82c9358c77017b94d67c1a3fa24e0500e07.zip qemu-6c90a82c9358c77017b94d67c1a3fa24e0500e07.tar.gz qemu-6c90a82c9358c77017b94d67c1a3fa24e0500e07.tar.bz2 |
tests/libqtest: Introduce qtest_init_with_serial()
Run qtest with a socket that connects QEMU chardev and test code.
Signed-off-by: Julia Suvorova <jusual@mail.ru>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Message-id: 20190123120759.7162-2-jusual@mail.ru
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r-- | tests/libqtest.c | 25 | ||||
-rw-r--r-- | tests/libqtest.h | 11 |
2 files changed, 36 insertions, 0 deletions
diff --git a/tests/libqtest.c b/tests/libqtest.c index 55750dd..6fb3085 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -315,6 +315,31 @@ QTestState *qtest_initf(const char *fmt, ...) return s; } +QTestState *qtest_init_with_serial(const char *extra_args, int *sock_fd) +{ + int sock_fd_init; + char *sock_path, sock_dir[] = "/tmp/qtest-serial-XXXXXX"; + QTestState *qts; + + g_assert_true(mkdtemp(sock_dir) != NULL); + sock_path = g_strdup_printf("%s/sock", sock_dir); + + sock_fd_init = init_socket(sock_path); + + qts = qtest_initf("-chardev socket,id=s0,path=%s -serial chardev:s0 %s", + sock_path, extra_args); + + *sock_fd = socket_accept(sock_fd_init); + + unlink(sock_path); + g_free(sock_path); + rmdir(sock_dir); + + g_assert_true(*sock_fd >= 0); + + return qts; +} + void qtest_quit(QTestState *s) { g_hook_destroy_link(&abrt_hooks, g_hook_find_data(&abrt_hooks, TRUE, s)); diff --git a/tests/libqtest.h b/tests/libqtest.h index 7ea9413..5937f91 100644 --- a/tests/libqtest.h +++ b/tests/libqtest.h @@ -63,6 +63,17 @@ QTestState *qtest_init(const char *extra_args); QTestState *qtest_init_without_qmp_handshake(const char *extra_args); /** + * qtest_init_with_serial: + * @extra_args: other arguments to pass to QEMU. CAUTION: these + * arguments are subject to word splitting and shell evaluation. + * @sock_fd: pointer to store the socket file descriptor for + * connection with serial. + * + * Returns: #QTestState instance. + */ +QTestState *qtest_init_with_serial(const char *extra_args, int *sock_fd); + +/** * qtest_quit: * @s: #QTestState instance to operate on. * |