[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 07/21] tests: Trying fixes test-replication.c on msys2/mingw.
From: |
Yonggang Luo |
Subject: |
[PATCH v2 07/21] tests: Trying fixes test-replication.c on msys2/mingw. |
Date: |
Wed, 9 Sep 2020 17:46:03 +0800 |
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>
---
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;
}
--
2.28.0.windows.1
- Re: [PATCH v2 02/21] ci: fixes msys2 build by upgrading capstone to 4.0.2, (continued)
- [PATCH v2 03/21] configure: Fixes ncursesw detection under msys2/mingw and enable curses, Yonggang Luo, 2020/09/09
- [PATCH v2 04/21] curses: Fixes curses compiling errors., Yonggang Luo, 2020/09/09
- [PATCH v2 05/21] tests: disable /char/stdio/* tests in test-char.c on win32, Yonggang Luo, 2020/09/09
- [PATCH v2 06/21] ci: Enable msys2 ci in cirrus, Yonggang Luo, 2020/09/09
- [PATCH v2 07/21] tests: Trying fixes test-replication.c on msys2/mingw.,
Yonggang Luo <=
- [PATCH v2 08/21] tests: test-replication disable /replication/secondary/* on msys2/mingw., Yonggang Luo, 2020/09/09
- [PATCH v2 09/21] osdep: These function are only available on Non-Win32 system., Yonggang Luo, 2020/09/09
- [PATCH v2 10/21] meson: Use -b to ignore CR vs. CR-LF issues on Windows, Yonggang Luo, 2020/09/09
- [PATCH v2 11/21] meson: disable crypto tests are empty under win32, Yonggang Luo, 2020/09/09