On Sun, Sep 25, 2022 at 3:54 PM Bin Meng <bmeng...@gmail.com> wrote:
> From: Bin Meng <bin.m...@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.m...@windriver.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
>
> Changes in v3:
> - Split to a separate patch
> - Ensure g_autofree variable is initialized
>
> tests/qtest/cxl-test.c | 15 ++++++---------
> 1 file changed, 6 insertions(+), 9 deletions(-)
>
> diff --git a/tests/qtest/cxl-test.c b/tests/qtest/cxl-test.c
> index 2e14da7dee..cbe0fb549b 100644
> --- a/tests/qtest/cxl-test.c
> +++ b/tests/qtest/cxl-test.c
> @@ -93,10 +93,9 @@ static void cxl_2root_port(void)
> static void cxl_t3d(void)
> {
> g_autoptr(GString) cmdline = g_string_new(NULL);
> - char template[] = "/tmp/cxl-test-XXXXXX";
> - const char *tmpfs;
> + g_autofree const char *tmpfs = NULL;
>
> - tmpfs = g_mkdtemp(template);
> + tmpfs = g_dir_make_tmp("cxl-test-XXXXXX", NULL);
>
> g_string_printf(cmdline, QEMU_PXB_CMD QEMU_RP QEMU_T3D, tmpfs, tmpfs);
>
> @@ -107,10 +106,9 @@ static void cxl_t3d(void)
> static void cxl_1pxb_2rp_2t3d(void)
> {
> g_autoptr(GString) cmdline = g_string_new(NULL);
> - char template[] = "/tmp/cxl-test-XXXXXX";
> - const char *tmpfs;
> + g_autofree const char *tmpfs = NULL;
>
> - tmpfs = g_mkdtemp(template);
> + tmpfs = g_dir_make_tmp("cxl-test-XXXXXX", NULL);
>
> g_string_printf(cmdline, QEMU_PXB_CMD QEMU_2RP QEMU_2T3D,
> tmpfs, tmpfs, tmpfs, tmpfs);
> @@ -122,10 +120,9 @@ static void cxl_1pxb_2rp_2t3d(void)
> static void cxl_2pxb_4rp_4t3d(void)
> {
> g_autoptr(GString) cmdline = g_string_new(NULL);
> - char template[] = "/tmp/cxl-test-XXXXXX";
> - const char *tmpfs;
> + g_autofree const char *tmpfs = NULL;
>
> - tmpfs = g_mkdtemp(template);
> + tmpfs = g_dir_make_tmp("cxl-test-XXXXXX", NULL);
>
> g_string_printf(cmdline, QEMU_2PXB_CMD QEMU_4RP QEMU_4T3D,
> tmpfs, tmpfs, tmpfs, tmpfs, tmpfs, tmpfs,
> --
> 2.34.1
>
>
>
--
Marc-André Lureau
