From: marcandre.lureau@redhat.com
To: qemu-devel@nongnu.org
Cc: "Alexander Bulekov" <alxndr@bu.edu>,
"Bandan Das" <bsd@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
"Hanna Reitz" <hreitz@redhat.com>,
"Markus Armbruster" <armbru@redhat.com>,
"Konstantin Kostiuk" <kkostiuk@redhat.com>,
"Stefan Weil" <sw@weilnetz.de>, "Kevin Wolf" <kwolf@redhat.com>,
"Darren Kenny" <darren.kenny@oracle.com>,
"Laurent Vivier" <lvivier@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Qiuhao Li" <Qiuhao.Li@outlook.com>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
qemu-block@nongnu.org,
"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: [PATCH v2 10/15] test/qga: use G_TEST_DIR to locate os-release test file
Date: Thu, 5 May 2022 12:14:26 +0400 [thread overview]
Message-ID: <20220505081431.934739-11-marcandre.lureau@redhat.com> (raw)
In-Reply-To: <20220505081431.934739-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>
---
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 d6df1ee92ea1..ab0b12a2dd16 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.0.44.g0f828332d5ac
next prev parent reply other threads:[~2022-05-05 8:51 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-05 8:14 [PATCH v2 00/15] Misc cleanups marcandre.lureau
2022-05-05 8:14 ` [PATCH v2 01/15] include: move qemu_*_exec_dir() to cutils marcandre.lureau
2022-05-05 8:14 ` [PATCH v2 02/15] util/win32: simplify qemu_get_local_state_dir() marcandre.lureau
2022-05-05 8:14 ` [PATCH v2 03/15] tests: make libqmp buildable for win32 marcandre.lureau
2022-05-05 10:52 ` Markus Armbruster
2022-05-05 11:08 ` Marc-André Lureau
2022-05-16 5:57 ` Markus Armbruster
2022-05-05 8:14 ` [PATCH v2 04/15] include: adjust header guards after renaming marcandre.lureau
2022-05-05 10:58 ` Markus Armbruster
2022-05-05 8:14 ` [PATCH v2 05/15] qga: flatten safe_open_or_create() marcandre.lureau
2022-05-05 11:19 ` Markus Armbruster
2022-05-05 11:27 ` Marc-André Lureau
2022-05-05 8:14 ` [PATCH v2 06/15] osdep: export qemu_open_cloexec() marcandre.lureau
2022-05-05 8:14 ` [PATCH v2 07/15] qga: use qemu_open_cloexec() for safe_open_or_create() marcandre.lureau
2022-05-05 11:32 ` Markus Armbruster
2022-05-13 10:02 ` Marc-André Lureau
2022-05-05 8:14 ` [PATCH v2 08/15] qga: throw an Error in ga_channel_open() marcandre.lureau
2022-05-05 11:39 ` Markus Armbruster
2022-05-05 11:49 ` Marc-André Lureau
2022-05-05 8:14 ` [PATCH v2 09/15] qga: replace qemu_open_old() with qemu_open_cloexec() marcandre.lureau
2022-05-05 11:42 ` Markus Armbruster
2022-05-05 11:54 ` Marc-André Lureau
2022-05-05 8:14 ` marcandre.lureau [this message]
2022-05-05 8:14 ` [PATCH v2 11/15] qga/wixl: prefer variables over environment marcandre.lureau
2022-05-05 8:25 ` Konstantin Kostiuk
2022-05-05 8:14 ` [PATCH v2 12/15] qga/wixl: require Mingw_bin marcandre.lureau
2022-05-05 8:26 ` Konstantin Kostiuk
2022-05-05 8:14 ` [PATCH v2 13/15] qga/wixl: simplify some pre-processing marcandre.lureau
2022-05-05 8:26 ` Konstantin Kostiuk
2022-05-05 8:14 ` [PATCH v2 14/15] qga/wixl: replace QEMU_GA_MSI_MINGW_BIN_PATH with glib bindir marcandre.lureau
2022-05-05 8:28 ` Konstantin Kostiuk
2022-05-05 8:14 ` [PATCH v2 15/15] test/qga: use g_auto wherever sensible marcandre.lureau
2022-05-05 11:47 ` Markus Armbruster
2022-05-05 11:51 ` Marc-André Lureau
2022-05-05 13:39 ` Markus Armbruster
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=20220505081431.934739-11-marcandre.lureau@redhat.com \
--to=marcandre.lureau@redhat.com \
--cc=Qiuhao.Li@outlook.com \
--cc=alxndr@bu.edu \
--cc=armbru@redhat.com \
--cc=bsd@redhat.com \
--cc=darren.kenny@oracle.com \
--cc=hreitz@redhat.com \
--cc=kkostiuk@redhat.com \
--cc=kwolf@redhat.com \
--cc=lvivier@redhat.com \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=sw@weilnetz.de \
--cc=thuth@redhat.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).