[v3] Misc cleanups

[PATCH v3 10/15] test/qga: use G_TEST_DIR to locate os-release test file

Posted by marcandre.lureau@redhat.com 2 years, 7 months ago

From: Marc-André Lureau <marcandre.lureau@redhat.com>

This a more accurate way to lookup the test data, and will allow to move
the test in a subproject.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 tests/unit/test-qga.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/tests/unit/test-qga.c b/tests/unit/test-qga.c
index d6df1ee92e..ab0b12a2dd 100644
--- a/tests/unit/test-qga.c
+++ b/tests/unit/test-qga.c
@@ -914,15 +914,14 @@ static void test_qga_guest_get_osinfo(gconstpointer data)
 {
     TestFixture fixture;
     const gchar *str;
-    gchar *cwd, *env[2];
-    QDict *ret, *val;
+    QDict *ret = NULL;
+    char *env[2];
+    QDict *val;
 
-    cwd = g_get_current_dir();
     env[0] = g_strdup_printf(
-        "QGA_OS_RELEASE=%s%ctests%cdata%ctest-qga-os-release",
-        cwd, G_DIR_SEPARATOR, G_DIR_SEPARATOR, G_DIR_SEPARATOR);
+        "QGA_OS_RELEASE=%s%c..%cdata%ctest-qga-os-release",
+        g_test_get_dir(G_TEST_DIST), G_DIR_SEPARATOR, G_DIR_SEPARATOR, G_DIR_SEPARATOR);
     env[1] = NULL;
-    g_free(cwd);
     fixture_setup(&fixture, NULL, env);
 
     ret = qmp_fd(fixture.fd, "{'execute': 'guest-get-osinfo'}");
-- 
2.36.1

Re: [PATCH v3 10/15] test/qga: use G_TEST_DIR to locate os-release test file

Posted by Konstantin Kostiuk 2 years, 7 months ago

Reviewed-by: Konstantin Kostiuk <kkostiuk@redhat.com>

On Fri, May 13, 2022 at 9:08 PM <marcandre.lureau@redhat.com> wrote:

> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> This a more accurate way to lookup the test data, and will allow to move
> the test in a subproject.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
>  tests/unit/test-qga.c | 11 +++++------
>  1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/tests/unit/test-qga.c b/tests/unit/test-qga.c
> index d6df1ee92e..ab0b12a2dd 100644
> --- a/tests/unit/test-qga.c
> +++ b/tests/unit/test-qga.c
> @@ -914,15 +914,14 @@ static void test_qga_guest_get_osinfo(gconstpointer
> data)
>  {
>      TestFixture fixture;
>      const gchar *str;
> -    gchar *cwd, *env[2];
> -    QDict *ret, *val;
> +    QDict *ret = NULL;
> +    char *env[2];

+    QDict *val;
>
> -    cwd = g_get_current_dir();
>      env[0] = g_strdup_printf(
> -        "QGA_OS_RELEASE=%s%ctests%cdata%ctest-qga-os-release",
> -        cwd, G_DIR_SEPARATOR, G_DIR_SEPARATOR, G_DIR_SEPARATOR);
> +        "QGA_OS_RELEASE=%s%c..%cdata%ctest-qga-os-release",
> +        g_test_get_dir(G_TEST_DIST), G_DIR_SEPARATOR, G_DIR_SEPARATOR,
> G_DIR_SEPARATOR);
>      env[1] = NULL;
> -    g_free(cwd);
>      fixture_setup(&fixture, NULL, env);
>
>      ret = qmp_fd(fixture.fd, "{'execute': 'guest-get-osinfo'}");
> --
> 2.36.1
>
>