[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 06/11] tests: Trying fixes test-replication.c on msys2.
From: |
Yonggang Luo |
Subject: |
[PATCH v5 06/11] tests: Trying fixes test-replication.c on msys2. |
Date: |
Sat, 5 Sep 2020 14:23:28 +0800 |
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
tests/test-replication.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/tests/test-replication.c b/tests/test-replication.c
index 9ab3666a90..d0e06f8d77 100644
--- a/tests/test-replication.c
+++ b/tests/test-replication.c
@@ -23,14 +23,18 @@
/* primary */
#define P_ID "primary-id"
-static char p_local_disk[] = "/tmp/p_local_disk.XXXXXX";
+#define P_LOCAL_DISK "%s/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";
+#define S_LOCAL_DISK "%s/s_local_disk.XXXXXX"
+static char s_local_disk[PATH_MAX];
+#define S_ACTIVE_DISK "%s/s_active_disk.XXXXXX"
+static char s_active_disk[PATH_MAX];
+#define S_HIDDEN_DISK "%s/s_hidden_disk.XXXXXX"
+static char s_hidden_disk[PATH_MAX];
/* FIXME: steal from blockdev.c */
QemuOptsList qemu_drive_opts = {
@@ -571,7 +575,12 @@ static void setup_sigabrt_handler(void)
int main(int argc, char **argv)
{
int ret;
+ const char *tmpdir = g_get_tmp_dir();
qemu_init_main_loop(&error_fatal);
+ sprintf(p_local_disk, P_LOCAL_DISK, tmpdir);
+ sprintf(s_local_disk, S_LOCAL_DISK, tmpdir);
+ sprintf(s_active_disk, S_ACTIVE_DISK, tmpdir);
+ sprintf(s_hidden_disk, S_HIDDEN_DISK, tmpdir);
bdrv_init();
g_test_init(&argc, &argv, NULL);
--
2.28.0.windows.1
- Re: [PATCH v5 01/11] Revert "configure: add --ninja option", (continued)
- [PATCH v5 04/11] meson: upgrade meson for execute custom ninjatool under msys2 properly, Yonggang Luo, 2020/09/05
- [PATCH v5 05/11] ci: Enable msys2 ci in cirrus, Yonggang Luo, 2020/09/05
- [PATCH v5 06/11] tests: Trying fixes test-replication.c on msys2.,
Yonggang Luo <=
- [PATCH v5 07/11] block: get file-win32.c handle locking option consistence with file-posix.c, Yonggang Luo, 2020/09/05
- [PATCH v5 08/11] osdep: These function are only available on Non-Win32 system., Yonggang Luo, 2020/09/05
- [PATCH v5 09/11] meson: Fixes qapi tests., Yonggang Luo, 2020/09/05
- [PATCH v5 10/11] docker: Add win32/msys2/mingw64 docker, Yonggang Luo, 2020/09/05
- [PATCH v5 11/11] ci: Enable Github actions., Yonggang Luo, 2020/09/05