| Message ID | 20220927110632.1973965-15-bmeng.cn@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | tests/qtest: Enable running qtest on Windows | expand |
Hi On Tue, Sep 27, 2022 at 3:07 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_dir_make_tmp() for a portable implementation. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> > --- > > Changes in v4: > - Update the error reporting by using the GError "error" argument > of g_dir_make_tmp() > - Remove the const from tmpfs declaration > > Changes in v3: > - Split to a separate patch > > tests/qtest/migration-test.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 4728d528bb..f57e07fe2d 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -102,7 +102,7 @@ static bool ufd_version_check(void) > > #endif > > -static const char *tmpfs; > +static char *tmpfs; > > /* The boot file modifies memory area in [start_address, end_address) > * repeatedly. It outputs a 'B' at a fixed rate while it's still running. > @@ -2434,10 +2434,10 @@ static bool kvm_dirty_ring_supported(void) > > int main(int argc, char **argv) > { > - char template[] = "/tmp/migration-test-XXXXXX"; > const bool has_kvm = qtest_has_accel("kvm"); > const bool has_uffd = ufd_version_check(); > const char *arch = qtest_get_arch(); > + GError *err = NULL; > int ret; > > g_test_init(&argc, &argv, NULL); > @@ -2462,9 +2462,11 @@ int main(int argc, char **argv) > return g_test_run(); > } > > - tmpfs = g_mkdtemp(template); > + tmpfs = g_dir_make_tmp("migration-test-XXXXXX", &err); > if (!tmpfs) { > - g_test_message("g_mkdtemp on path (%s): %s", template, strerror(errno)); > + g_test_message("g_dir_make_tmp on path (%s): %s", tmpfs, > + err->message); > + g_error_free(err); You missed the opportunity to use g_autoptr(GError), ok anyway Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > } > g_assert(tmpfs); > > @@ -2589,6 +2591,7 @@ int main(int argc, char **argv) > g_test_message("unable to rmdir: path (%s): %s", > tmpfs, strerror(errno)); > } > + g_free(tmpfs); > > return ret; > } > -- > 2.34.1 >
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 4728d528bb..f57e07fe2d 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -102,7 +102,7 @@ static bool ufd_version_check(void) #endif -static const char *tmpfs; +static char *tmpfs; /* The boot file modifies memory area in [start_address, end_address) * repeatedly. It outputs a 'B' at a fixed rate while it's still running. @@ -2434,10 +2434,10 @@ static bool kvm_dirty_ring_supported(void) int main(int argc, char **argv) { - char template[] = "/tmp/migration-test-XXXXXX"; const bool has_kvm = qtest_has_accel("kvm"); const bool has_uffd = ufd_version_check(); const char *arch = qtest_get_arch(); + GError *err = NULL; int ret; g_test_init(&argc, &argv, NULL); @@ -2462,9 +2462,11 @@ int main(int argc, char **argv) return g_test_run(); } - tmpfs = g_mkdtemp(template); + tmpfs = g_dir_make_tmp("migration-test-XXXXXX", &err); if (!tmpfs) { - g_test_message("g_mkdtemp on path (%s): %s", template, strerror(errno)); + g_test_message("g_dir_make_tmp on path (%s): %s", tmpfs, + err->message); + g_error_free(err); } g_assert(tmpfs); @@ -2589,6 +2591,7 @@ int main(int argc, char **argv) g_test_message("unable to rmdir: path (%s): %s", tmpfs, strerror(errno)); } + g_free(tmpfs); return ret; }