[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 21/54] tests/qtest: libqtest: Avoid using hardcoded /tmp
From: |
Bin Meng |
Subject: |
[PATCH v4 21/54] tests/qtest: libqtest: Avoid using hardcoded /tmp |
Date: |
Tue, 27 Sep 2022 19:05:59 +0800 |
From: Bin Meng <bin.meng@windriver.com>
The qtest library was written to use hardcoded /tmp directory for
temporary files. Update to use g_get_tmp_dir() and g_dir_make_tmp()
for a portable implementation.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
(no changes since v3)
Changes in v3:
- Split to a separate patch
- Ensure g_autofree variable is initialized
tests/qtest/libqtest.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tests/qtest/libqtest.c b/tests/qtest/libqtest.c
index 7c9fc07de4..d8ffa0e7b1 100644
--- a/tests/qtest/libqtest.c
+++ b/tests/qtest/libqtest.c
@@ -265,8 +265,10 @@ QTestState *qtest_init_without_qmp_handshake(const char
*extra_args)
s = g_new(QTestState, 1);
- socket_path = g_strdup_printf("/tmp/qtest-%d.sock", getpid());
- qmp_socket_path = g_strdup_printf("/tmp/qtest-%d.qmp", getpid());
+ socket_path = g_strdup_printf("%s/qtest-%d.sock",
+ g_get_tmp_dir(), getpid());
+ qmp_socket_path = g_strdup_printf("%s/qtest-%d.qmp",
+ g_get_tmp_dir(), getpid());
/* It's possible that if an earlier test run crashed it might
* have left a stale unix socket lying around. Delete any
@@ -390,10 +392,12 @@ QTestState *qtest_initf(const char *fmt, ...)
QTestState *qtest_init_with_serial(const char *extra_args, int *sock_fd)
{
int sock_fd_init;
- char *sock_path, sock_dir[] = "/tmp/qtest-serial-XXXXXX";
+ g_autofree char *sock_dir = NULL;
+ char *sock_path;
QTestState *qts;
- g_assert_true(g_mkdtemp(sock_dir) != NULL);
+ sock_dir = g_dir_make_tmp("qtest-serial-XXXXXX", NULL);
+ g_assert_true(sock_dir != NULL);
sock_path = g_strdup_printf("%s/sock", sock_dir);
sock_fd_init = init_socket(sock_path);
--
2.34.1
- [PATCH v4 08/54] tests/qtest: cxl-test: Avoid using hardcoded /tmp, (continued)
- [PATCH v4 08/54] tests/qtest: cxl-test: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 10/54] tests/qtest: generic_fuzz: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 06/54] tests/qtest: aspeed_smc-test: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 04/54] util/qemu-sockets: Use g_get_tmp_dir() to get the directory for temporary files, Bin Meng, 2022/09/27
- [PATCH v4 05/54] tests/qtest: ahci-test: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 12/54] tests/qtest: hd-geo-test: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 14/54] tests/qtest: migration-test: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 21/54] tests/qtest: libqtest: Avoid using hardcoded /tmp,
Bin Meng <=
- [PATCH v4 19/54] tests/qtest: virtio-blk-test: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 20/54] tests/qtest: virtio-scsi-test: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 22/54] tests/unit: test-image-locking: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 25/54] block/vvfat: Unify the mkdir() call, Bin Meng, 2022/09/27
- [PATCH v4 24/54] tests: vhost-user-bridge: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 15/54] tests/qtest: pflash-cfi02-test: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27
- [PATCH v4 16/54] tests/qtest: qmp-test: Avoid using hardcoded /tmp, Bin Meng, 2022/09/27