Port test-privserver to windows by using the TEST_LISTEN bus address.

[platform/upstream/dbus.git] / test / name-test / test-privserver.c

diff --git a/test/name-test/test-privserver.c b/test/name-test/test-privserver.c
index 8a6efc4..39a98b7 100644 (file)
--- a/test/name-test/test-privserver.c
+++ b/test/name-test/test-privserver.c
@@ -1,3 +1,4 @@
+#include <config.h>
 #include "../test-utils.h"
 
 static void
@@ -37,7 +38,7 @@ filter_session_message (DBusConnection     *connection,
   TestServiceData *testdata = user_data;
 
   if (dbus_message_is_method_call (message,
-                                   "org.freedesktop.DBus.TestSuite.TestServer",
+                                   "org.freedesktop.DBus.TestSuite.PrivServer",
                                    "GetPrivateAddress"))
     {
        DBusMessage *reply;
@@ -49,7 +50,7 @@ filter_session_message (DBusConnection     *connection,
        return DBUS_HANDLER_RESULT_HANDLED;
     }
   else if (dbus_message_is_method_call (message,
-                                   "org.freedesktop.DBus.TestSuite.TestServer",
+                                   "org.freedesktop.DBus.TestSuite.PrivServer",
                                    "Quit"))
     {
       fprintf (stderr, "server exiting loop\n");
@@ -81,14 +82,18 @@ main (int argc, char *argv[])
 
   test_connection_setup (loop, session);
 
-  dbus_bus_request_name (session, "org.freedesktop.DBus.TestSuite.TestServer", 0, &error);
+  dbus_bus_request_name (session, "org.freedesktop.DBus.TestSuite.PrivServer", 0, &error);
   if (dbus_error_is_set (&error))
     die ("couldn't request name: %s", error.message);
 
   if (!dbus_connection_add_filter (session, filter_session_message, testdata, NULL))
     die ("couldn't add filter");
 
+#ifdef DBUS_CMAKE
+  server = dbus_server_listen (TEST_LISTEN, &error);
+#else
   server = dbus_server_listen ("unix:tmpdir=/tmp", &error);
+#endif
   if (!server)
     die (error.message);
   testdata->private_addr = dbus_server_get_address (server);