| Message ID | 20220927110632.1973965-19-bmeng.cn@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/qtest: Enable running qtest on Windows | expand |
On Tue, Sep 27, 2022 at 3:07 PM Bin Meng <bmeng.cn@gmail.com> wrote: > > From: Bin Meng <bin.meng@windriver.com> > > This case was written to use hardcoded /tmp directory for temporary > files. Update to use g_dir_make_tmp() for a portable implementation. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > --- > > Changes in v4: > - Update error reporting > > Changes in v3: > - Split to a separate patch > - Ensure g_autofree variable is initialized > > tests/qtest/vhost-user-test.c | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c > index d7d6cfc9bd..84498941a6 100644 > --- a/tests/qtest/vhost-user-test.c > +++ b/tests/qtest/vhost-user-test.c > @@ -482,8 +482,8 @@ static TestServer *test_server_new(const gchar *name, > struct vhost_user_ops *ops) > { > TestServer *server = g_new0(TestServer, 1); > - char template[] = "/tmp/vhost-test-XXXXXX"; > - const char *tmpfs; > + g_autofree const char *tmpfs = NULL; > + GError *err = NULL; > > server->context = g_main_context_new(); > server->loop = g_main_loop_new(server->context, FALSE); > @@ -491,9 +491,11 @@ static TestServer *test_server_new(const gchar *name, > /* run the main loop thread so the chardev may operate */ > server->thread = g_thread_new(NULL, thread_function, server->loop); > > - tmpfs = g_mkdtemp(template); > + tmpfs = g_dir_make_tmp("vhost-test-XXXXXX", &err); > if (!tmpfs) { > - g_test_message("g_mkdtemp on path (%s): %s", template, strerror(errno)); > + g_test_message("g_dir_make_tmp on path (%s): %s", tmpfs, > + err->message); > + g_error_free(err); You missed the opportunity to use g_autoptr(GError), ok anyway Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > } > g_assert(tmpfs); > > -- > 2.34.1 >
diff --git a/tests/qtest/vhost-user-test.c b/tests/qtest/vhost-user-test.c index d7d6cfc9bd..84498941a6 100644 --- a/tests/qtest/vhost-user-test.c +++ b/tests/qtest/vhost-user-test.c @@ -482,8 +482,8 @@ static TestServer *test_server_new(const gchar *name, struct vhost_user_ops *ops) { TestServer *server = g_new0(TestServer, 1); - char template[] = "/tmp/vhost-test-XXXXXX"; - const char *tmpfs; + g_autofree const char *tmpfs = NULL; + GError *err = NULL; server->context = g_main_context_new(); server->loop = g_main_loop_new(server->context, FALSE); @@ -491,9 +491,11 @@ static TestServer *test_server_new(const gchar *name, /* run the main loop thread so the chardev may operate */ server->thread = g_thread_new(NULL, thread_function, server->loop); - tmpfs = g_mkdtemp(template); + tmpfs = g_dir_make_tmp("vhost-test-XXXXXX", &err); if (!tmpfs) { - g_test_message("g_mkdtemp on path (%s): %s", template, strerror(errno)); + g_test_message("g_dir_make_tmp on path (%s): %s", tmpfs, + err->message); + g_error_free(err); } g_assert(tmpfs);