Julia Suvorova <jus...@mail.ru> writes:
> Run qtest with a socket that connects QEMU chardev and test code.
>
> Signed-off-by: Julia Suvorova <jus...@mail.ru>
> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
Reviewed-by: Alex Bennée <alex.ben...@linaro.org>
> ---
> tests/libqtest.c | 25 +++++++++++++++++++++++++
> tests/libqtest.h | 11 +++++++++++
> 2 files changed, 36 insertions(+)
>
> diff --git a/tests/libqtest.c b/tests/libqtest.c
> index 55750dd68d..6fb30855fa 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 7ea94139b0..5937f91912 100644
> --- a/tests/libqtest.h
> +++ b/tests/libqtest.h
> @@ -62,6 +62,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.
--
Alex Bennée
