From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51733) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCoDJ-0006v1-93 for qemu-devel@nongnu.org; Tue, 14 Jun 2016 09:17:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bCoDE-00015O-E9 for qemu-devel@nongnu.org; Tue, 14 Jun 2016 09:17:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44322) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bCoDE-00015I-5c for qemu-devel@nongnu.org; Tue, 14 Jun 2016 09:17:00 -0400 From: marcandre.lureau@redhat.com Date: Tue, 14 Jun 2016 15:16:54 +0200 Message-Id: <1465910214-22516-3-git-send-email-marcandre.lureau@redhat.com> In-Reply-To: <1465910214-22516-1-git-send-email-marcandre.lureau@redhat.com> References: <1465910214-22516-1-git-send-email-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 2/2] tests: use static qga config file List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, mdroth@linux.vnet.ibm.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau Do not create a leaking temporary file, but use a static file instead. Signed-off-by: Marc-Andr=C3=A9 Lureau Reported-by: Peter Maydell --- tests/test-qga-config | 8 ++++++++ tests/test-qga.c | 27 ++++----------------------- 2 files changed, 12 insertions(+), 23 deletions(-) create mode 100644 tests/test-qga-config diff --git a/tests/test-qga-config b/tests/test-qga-config new file mode 100644 index 0000000..4bb721a --- /dev/null +++ b/tests/test-qga-config @@ -0,0 +1,8 @@ +[general] +daemon=3Dfalse +method=3Dvirtio-serial +path=3D/path/to/org.qemu.guest_agent.0 +pidfile=3D/var/foo/qemu-ga.pid +statedir=3D/var/state +verbose=3Dtrue +blacklist=3Dguest-ping;guest-get-time diff --git a/tests/test-qga.c b/tests/test-qga.c index 251b201..8686c23 100644 --- a/tests/test-qga.c +++ b/tests/test-qga.c @@ -691,28 +691,11 @@ static void test_qga_blacklist(gconstpointer data) static void test_qga_config(gconstpointer data) { GError *error =3D NULL; - char *cwd, *cmd, *out, *err, *str, **strv, *conf, **argv =3D NULL; + char *cwd, *cmd, *out, *err, *str, **strv, **argv =3D NULL; char *env[2]; - int status, tmp; + int status; gsize n; GKeyFile *kf; - const char *qga_config =3D - "[general]\n" - "daemon=3Dfalse\n" - "method=3Dvirtio-serial\n" - "path=3D/path/to/org.qemu.guest_agent.0\n" - "pidfile=3D/var/foo/qemu-ga.pid\n" - "statedir=3D/var/state\n" - "verbose=3Dtrue\n" - "blacklist=3Dguest-ping;guest-get-time\n"; - - tmp =3D g_file_open_tmp(NULL, &conf, &error); - g_assert_no_error(error); - g_assert_cmpint(tmp, >=3D, 0); - g_assert_cmpstr(conf, !=3D, ""); - - g_file_set_contents(conf, qga_config, -1, &error); - g_assert_no_error(error); =20 cwd =3D g_get_current_dir(); cmd =3D g_strdup_printf("%s%cqemu-ga -D", @@ -720,7 +703,8 @@ static void test_qga_config(gconstpointer data) g_shell_parse_argv(cmd, NULL, &argv, &error); g_assert_no_error(error); =20 - env[0] =3D g_strdup_printf("QGA_CONF=3D%s", conf); + env[0] =3D g_strdup_printf("QGA_CONF=3D%s%ctests%ctest-qga-config", + QEMU_SRC_PATH, G_DIR_SEPARATOR, G_DIR_SEPAR= ATOR); env[1] =3D NULL; g_spawn_sync(NULL, argv, env, 0, NULL, NULL, &out, &err, &status, &error); @@ -775,11 +759,8 @@ static void test_qga_config(gconstpointer data) =20 g_free(out); g_free(err); - g_free(conf); g_free(env[0]); g_key_file_free(kf); - - close(tmp); } =20 static void test_qga_fsfreeze_status(gconstpointer fix) --=20 2.7.4