From 03dac62937639dd4c701a582c26bb3bd35cc8028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 24 Mar 2022 15:39:44 +0400 Subject: [PATCH] test/relay: do not hardcode /tmp on !unix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marc-André Lureau --- test/relay.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/test/relay.c b/test/relay.c index 044260af..77a40849 100644 --- a/test/relay.c +++ b/test/relay.c @@ -338,6 +338,12 @@ main (int argc, char **argv) { int ret; +#ifdef DBUS_UNIX + char *tmp = _dbus_strdup ("/tmp"); +#else + char *tmp = dbus_address_escape_value (g_get_tmp_dir ()); +#endif + gchar *unix_tmpdir = g_strdup_printf ("unix:tmpdir=%s", tmp); test_init (&argc, &argv); @@ -349,15 +355,17 @@ main (int argc, test_limit, teardown); #ifdef DBUS_UNIX - g_test_add ("/connect/unix", Fixture, "unix:tmpdir=/tmp", setup, + g_test_add ("/connect/unix", Fixture, unix_tmpdir, setup, test_connect, teardown); - g_test_add ("/relay/unix", Fixture, "unix:tmpdir=/tmp", setup, + g_test_add ("/relay/unix", Fixture, unix_tmpdir, setup, test_relay, teardown); - g_test_add ("/limit/unix", Fixture, "unix:tmpdir=/tmp", setup, + g_test_add ("/limit/unix", Fixture, unix_tmpdir, setup, test_limit, teardown); #endif ret = g_test_run (); dbus_shutdown (); + g_free (unix_tmpdir); + dbus_free (tmp); return ret; }