From: Marc-André Lureau <marcandre.lureau@redhat.com>
Date: Thu, 24 Mar 2022 11:39:44 +0000 (+0400)
Subject: test/relay: do not hardcode /tmp on !unix
X-Git-Tag: dbus-1.15.0~26^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03dac62937639dd4c701a582c26bb3bd35cc8028;p=thirdparty%2Fdbus.git

test/relay: do not hardcode /tmp on !unix

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---

diff --git a/test/relay.c b/test/relay.c
index 044260afa..77a408498 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;
 }