| Message ID | 20220925113032.1949844-21-bmeng.cn@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/qtest: Enable running qtest on Windows | expand |
On Sun, Sep 25, 2022 at 4:10 PM Bin Meng <bmeng.cn@gmail.com> wrote: > From: Bin Meng <bin.meng@windriver.com> > > This case was written to use hardcoded /tmp directory for temporary > files. Update to use g_file_open_tmp() for a portable implementation. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > > Changes in v3: > - Split to a separate patch > - Ensure g_autofree variable is initialized > > tests/qtest/virtio-scsi-test.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tests/qtest/virtio-scsi-test.c > b/tests/qtest/virtio-scsi-test.c > index 8ceb12aacd..ceaa7f2415 100644 > --- a/tests/qtest/virtio-scsi-test.c > +++ b/tests/qtest/virtio-scsi-test.c > @@ -268,7 +268,7 @@ static void test_iothread_attach_node(void *obj, void > *data, > QVirtioSCSIPCI *scsi_pci = obj; > QVirtioSCSI *scsi = &scsi_pci->scsi; > QVirtioSCSIQueues *vs; > - char tmp_path[] = "/tmp/qtest.XXXXXX"; > + g_autofree char *tmp_path = NULL; > int fd; > int ret; > > @@ -282,7 +282,7 @@ static void test_iothread_attach_node(void *obj, void > *data, > vs = qvirtio_scsi_init(scsi->vdev); > > /* Create a temporary qcow2 overlay*/ > - fd = mkstemp(tmp_path); > + fd = g_file_open_tmp("qtest.XXXXXX", &tmp_path, NULL); > g_assert(fd >= 0); > close(fd); > > -- > 2.34.1 > > >
diff --git a/tests/qtest/virtio-scsi-test.c b/tests/qtest/virtio-scsi-test.c index 8ceb12aacd..ceaa7f2415 100644 --- a/tests/qtest/virtio-scsi-test.c +++ b/tests/qtest/virtio-scsi-test.c @@ -268,7 +268,7 @@ static void test_iothread_attach_node(void *obj, void *data, QVirtioSCSIPCI *scsi_pci = obj; QVirtioSCSI *scsi = &scsi_pci->scsi; QVirtioSCSIQueues *vs; - char tmp_path[] = "/tmp/qtest.XXXXXX"; + g_autofree char *tmp_path = NULL; int fd; int ret; @@ -282,7 +282,7 @@ static void test_iothread_attach_node(void *obj, void *data, vs = qvirtio_scsi_init(scsi->vdev); /* Create a temporary qcow2 overlay*/ - fd = mkstemp(tmp_path); + fd = g_file_open_tmp("qtest.XXXXXX", &tmp_path, NULL); g_assert(fd >= 0); close(fd);