From 0296c1fcbf23047e04dc306a7aaf6e9682af6eaf Mon Sep 17 00:00:00 2001
From: Simon McVittie <smcv@collabora.com>
Date: Fri, 28 Sep 2018 17:06:00 +0100
Subject: [PATCH] test: Move _dbus_transport_unix_test() here

This requires exposing _dbus_connection_get_address() as an internal
symbol, but that seems worth it.

Signed-off-by: Simon McVittie <smcv@collabora.com>
---
 dbus/dbus-connection-internal.h |  1 +
 dbus/dbus-test.h                |  3 ---
 dbus/dbus-transport-unix.c      | 29 -----------------------------
 test/internals/misc-internals.c | 28 ++++++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 32 deletions(-)

diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h
index bcc5570a3..06302dd00 100644
--- a/dbus/dbus-connection-internal.h
+++ b/dbus/dbus-connection-internal.h
@@ -137,6 +137,7 @@ void _dbus_connection_get_stats (DBusConnection *connection,
 
 
 /* if DBUS_ENABLE_EMBEDDED_TESTS */
+DBUS_PRIVATE_EXPORT
 const char* _dbus_connection_get_address (DBusConnection *connection);
 
 /* This _dbus_bus_* stuff doesn't really belong here, but dbus-bus-internal.h seems
diff --git a/dbus/dbus-test.h b/dbus/dbus-test.h
index ce43497df..c20bf05fc 100644
--- a/dbus/dbus-test.h
+++ b/dbus/dbus-test.h
@@ -61,9 +61,6 @@ dbus_bool_t _dbus_data_slot_test         (const char *test_data_dir);
 DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_userdb_test            (const char *test_data_dir);
 
-DBUS_PRIVATE_EXPORT
-dbus_bool_t _dbus_transport_unix_test    (const char *test_data_dir);
-
 DBUS_PRIVATE_EXPORT
 dbus_bool_t _dbus_memory_test            (const char *test_data_dir);
 
diff --git a/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c
index 1989c9bb4..30c3ba44a 100644
--- a/dbus/dbus-transport-unix.c
+++ b/dbus/dbus-transport-unix.c
@@ -407,32 +407,3 @@ _dbus_transport_open_platform_specific (DBusAddressEntry  *entry,
 }
 
 /** @} */
-
-#ifdef DBUS_ENABLE_EMBEDDED_TESTS
-
-dbus_bool_t
-_dbus_transport_unix_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
-{
-  DBusConnection *c;
-  DBusError error;
-  dbus_bool_t ret;
-  const char *address;
-
-  dbus_error_init (&error);
-
-  c = dbus_connection_open ("unixexec:argv0=false,argv1=foobar,path=/bin/false", &error);
-  _dbus_assert (c != NULL);
-  _dbus_assert (!dbus_error_is_set (&error));
-
-  address = _dbus_connection_get_address (c);
-  _dbus_assert (address != NULL);
-
-  /* Let's see if the address got parsed, reordered and formatted correctly */
-  ret = strcmp (address, "unixexec:path=/bin/false,argv0=false,argv1=foobar") == 0;
-
-  dbus_connection_unref (c);
-
-  return ret;
-}
-
-#endif
diff --git a/test/internals/misc-internals.c b/test/internals/misc-internals.c
index a9cc0f0bc..138cd3536 100644
--- a/test/internals/misc-internals.c
+++ b/test/internals/misc-internals.c
@@ -26,6 +26,7 @@
 #include <config.h>
 
 #include <dbus/dbus.h>
+#include "dbus/dbus-connection-internal.h"
 #include "dbus/dbus-internals.h"
 #include "dbus/dbus-test.h"
 #include "dbus/dbus-test-tap.h"
@@ -318,6 +319,33 @@ _dbus_signature_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
 #endif
 }
 
+#ifdef DBUS_UNIX
+static dbus_bool_t
+_dbus_transport_unix_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
+{
+  DBusConnection *c;
+  DBusError error;
+  dbus_bool_t ret;
+  const char *address;
+
+  dbus_error_init (&error);
+
+  c = dbus_connection_open ("unixexec:argv0=false,argv1=foobar,path=/bin/false", &error);
+  _dbus_assert (c != NULL);
+  _dbus_assert (!dbus_error_is_set (&error));
+
+  address = _dbus_connection_get_address (c);
+  _dbus_assert (address != NULL);
+
+  /* Let's see if the address got parsed, reordered and formatted correctly */
+  ret = strcmp (address, "unixexec:path=/bin/false,argv0=false,argv1=foobar") == 0;
+
+  dbus_connection_unref (c);
+
+  return ret;
+}
+#endif
+
 static DBusTestCase tests[] =
 {
   { "string", _dbus_string_test },
-- 
2.47.3