[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/16] tests: Trying fixes test-replication.c on msys2/mingw.
From: |
Yonggang Luo |
Subject: |
[PULL 07/16] tests: Trying fixes test-replication.c on msys2/mingw. |
Date: |
Wed, 9 Sep 2020 02:49:09 +0800 |
On Windows there is no path like /tmp/s_local_disk.XXXXXX
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
tests/test-replication.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/tests/test-replication.c b/tests/test-replication.c
index 9ab3666a90..cfc1ae6feb 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[PATH_MAX];
/* 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[PATH_MAX];
+static char s_active_disk[PATH_MAX];
+static char s_hidden_disk[PATH_MAX];
/* 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();
+ snprintf(p_local_disk, sizeof(p_local_disk), "%s/p_local_disk.XXXXXX",
tmpdir);
+ snprintf(s_local_disk, sizeof(s_local_disk), "%s/s_local_disk.XXXXXX",
tmpdir);
+ snprintf(s_active_disk, sizeof(s_active_disk), "%s/s_active_disk.XXXXXX",
tmpdir);
+ snprintf(s_hidden_disk, sizeof(s_hidden_disk), "%s/s_hidden_disk.XXXXXX",
tmpdir);
qemu_init_main_loop(&error_fatal);
bdrv_init();
--
2.28.0.windows.1
- [PULL 00/16] Msys2 patches patches, Yonggang Luo, 2020/09/08
- [PULL 01/16] block: Fixes nfs on msys2/mingw, Yonggang Luo, 2020/09/08
- [PULL 02/16] ci: fixes msys2 build by upgrading capstone to 4.0.2, Yonggang Luo, 2020/09/08
- [PULL 04/16] curses: Fixes curses compiling errors., Yonggang Luo, 2020/09/08
- [PULL 05/16] tests: disable /char/stdio/* tests in test-char.c on win32, Yonggang Luo, 2020/09/08
- [PULL 03/16] configure: Fixes ncursesw detection under msys2/mingw and enable curses, Yonggang Luo, 2020/09/08
- [PULL 06/16] ci: Enable msys2 ci in cirrus, Yonggang Luo, 2020/09/08
- [PULL 07/16] tests: Trying fixes test-replication.c on msys2/mingw.,
Yonggang Luo <=
- [PULL 08/16] block: get file-win32.c handle locking option consistence with file-posix.c, Yonggang Luo, 2020/09/08
- [PULL 09/16] osdep: These function are only available on Non-Win32 system., Yonggang Luo, 2020/09/08
- [PULL 10/16] meson: Use -b to ignore CR vs. CR-LF issues on Windows, Yonggang Luo, 2020/09/08
- [PULL 11/16] meson: disable crypto tests are empty under win32, Yonggang Luo, 2020/09/08
- [PULL 12/16] meson: remove empty else and duplicated gio deps, Yonggang Luo, 2020/09/08
- [PULL 13/16] vmstate: Fixes test-vmstate.c on msys2/mingw, Yonggang Luo, 2020/09/08
- [PULL 14/16] cirrus: Building freebsd in a single short, Yonggang Luo, 2020/09/08
- [PULL 15/16] logging: Fixes memory leak in test-logging.c, Yonggang Luo, 2020/09/08
- [PULL 16/16] rcu: add uninit destructor for rcu, Yonggang Luo, 2020/09/08
- Re: [PULL 00/16] Msys2 patches patches, Eric Blake, 2020/09/08