[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v8 08/27] tests: Fixes test-replication.c on msys2/mingw.
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [PATCH v8 08/27] tests: Fixes test-replication.c on msys2/mingw. |
Date: |
Sun, 13 Sep 2020 17:37:32 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 |
On 9/13/20 12:44 AM, Yonggang Luo wrote:
> On Windows there is no path like /tmp/s_local_disk.XXXXXX
> Use g_get_tmp_dir instead of /tmp.
>
> Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
> tests/test-replication.c | 18 ++++++++++++++----
> 1 file changed, 14 insertions(+), 4 deletions(-)
>
> diff --git a/tests/test-replication.c b/tests/test-replication.c
> index 9ab3666a90..e7cbd6b144 100644
> --- a/tests/test-replication.c
> +++ b/tests/test-replication.c
> @@ -23,14 +23,14 @@
>
> /* primary */
> #define P_ID "primary-id"
> -static char p_local_disk[] = "/tmp/p_local_disk.XXXXXX";
> +static char *p_local_disk;
>
> /* secondary */
> #define S_ID "secondary-id"
> #define S_LOCAL_DISK_ID "secondary-local-disk-id"
> -static char s_local_disk[] = "/tmp/s_local_disk.XXXXXX";
> -static char s_active_disk[] = "/tmp/s_active_disk.XXXXXX";
> -static char s_hidden_disk[] = "/tmp/s_hidden_disk.XXXXXX";
> +static char *s_local_disk;
> +static char *s_active_disk;
> +static char *s_hidden_disk;
>
> /* FIXME: steal from blockdev.c */
> QemuOptsList qemu_drive_opts = {
> @@ -571,6 +571,11 @@ static void setup_sigabrt_handler(void)
> int main(int argc, char **argv)
> {
> int ret;
> + const char *tmpdir = g_get_tmp_dir();
> + p_local_disk = g_strdup_printf("%s/p_local_disk.XXXXXX", tmpdir);
> + s_local_disk = g_strdup_printf("%s/s_local_disk.XXXXXX", tmpdir);
> + s_active_disk = g_strdup_printf("%s/s_active_disk.XXXXXX", tmpdir);
> + s_hidden_disk = g_strdup_printf("%s/s_hidden_disk.XXXXXX", tmpdir);
> qemu_init_main_loop(&error_fatal);
> bdrv_init();
>
> @@ -605,5 +610,10 @@ int main(int argc, char **argv)
>
> cleanup_imgs();
>
> + g_free(p_local_disk);
> + g_free(s_local_disk);
> + g_free(s_active_disk);
> + g_free(s_hidden_disk);
> +
> return ret;
> }
>
[PATCH v8 10/27] osdep: file locking functions are not available on Win32, Yonggang Luo, 2020/09/12
[PATCH v8 09/27] tests: test-replication disable /replication/secondary/* on msys2/mingw., Yonggang Luo, 2020/09/12
[PATCH v8 08/27] tests: Fixes test-replication.c on msys2/mingw., Yonggang Luo, 2020/09/12
- Re: [PATCH v8 08/27] tests: Fixes test-replication.c on msys2/mingw.,
Philippe Mathieu-Daudé <=
[PATCH v8 12/27] gcrypt: test_tls_psk_init should write binary file instead text file., Yonggang Luo, 2020/09/12
[PATCH v8 13/27] tests: Enable crypto tests under msys2/mingw, Yonggang Luo, 2020/09/12
- Re: [PATCH v8 13/27] tests: Enable crypto tests under msys2/mingw, Thomas Huth, 2020/09/14
- Re: [PATCH v8 13/27] tests: Enable crypto tests under msys2/mingw, Yonggang Luo, 2020/09/14
- Re: [PATCH v8 13/27] tests: Enable crypto tests under msys2/mingw, Thomas Huth, 2020/09/14
- Re: [PATCH v8 13/27] tests: Enable crypto tests under msys2/mingw, Yonggang Luo, 2020/09/14
- Re: [PATCH v8 13/27] tests: Enable crypto tests under msys2/mingw, Daniel P . Berrangé, 2020/09/14
- Re: [PATCH v8 13/27] tests: Enable crypto tests under msys2/mingw, Yonggang Luo, 2020/09/14
[PATCH v8 14/27] meson: remove empty else and duplicated gio deps, Yonggang Luo, 2020/09/12