All of lore.kernel.org
 help / color / mirror / Atom feed
From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: "Konstantin Kostiuk" <kkostiuk@redhat.com>,
	"Markus Armbruster" <armbru@redhat.com>,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PATCH v5 10/15] test/qga: use G_TEST_DIR to locate os-release test file
Date: Wed, 25 May 2022 16:41:35 +0200	[thread overview]
Message-ID: <20220525144140.591926-11-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20220525144140.591926-1-marcandre.lureau@redhat.com>

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>
Reviewed-by: Konstantin Kostiuk <kkostiuk@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



  parent reply	other threads:[~2022-05-25 15:09 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-25 14:41 [PATCH v5 00/15] Misc cleanups marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 01/15] include: move qemu_*_exec_dir() to cutils marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 02/15] util/win32: simplify qemu_get_local_state_dir() marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 03/15] tests: make libqmp buildable for win32 marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 04/15] qga: flatten safe_open_or_create() marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 05/15] qga: add qga_open_cloexec() helper marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 06/15] qga: use qga_open_cloexec() for safe_open_or_create() marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 07/15] qga: throw an Error in ga_channel_open() marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 08/15] qga: replace qemu_open_old() with qga_open_cloexec() marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 09/15] qga: make build_fs_mount_list() return a bool marcandre.lureau
2022-05-25 14:41 ` marcandre.lureau [this message]
2022-05-25 14:41 ` [PATCH v5 11/15] qga/wixl: prefer variables over environment marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 12/15] qga/wixl: require Mingw_bin marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 13/15] qga/wixl: simplify some pre-processing marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 14/15] qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir marcandre.lureau
2022-05-25 14:41 ` [PATCH v5 15/15] test/qga: use g_auto wherever sensible marcandre.lureau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220525144140.591926-11-marcandre.lureau@redhat.com \
    --to=marcandre.lureau@redhat.com \
    --cc=armbru@redhat.com \
    --cc=kkostiuk@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.