Merge "Optional autogen.sh flag --enable-kdbus-transport added allowing to compile...

[platform/upstream/dbus.git] / test / test-service.c

diff --git a/test/test-service.c b/test/test-service.c
index a57bf9c..7181fa3 100644 (file)
--- a/test/test-service.c
+++ b/test/test-service.c
@@ -1,3 +1,4 @@
+#include <config.h>
 
 #include "test-utils.h"
 #ifdef HAVE_UNISTD_H
@@ -409,7 +410,11 @@ main (int    argc,
   else
     {
       name = argv[1];
+#ifndef DBUS_WIN
       do_fork = strcmp (argv[2], "fork") == 0;
+#else
+      do_fork = FALSE;
+#endif
     }
 
   /* The bare minimum for simulating a program "daemonizing"; the intent
@@ -417,13 +422,15 @@ main (int    argc,
    * activated services.
    * https://bugzilla.redhat.com/show_bug.cgi?id=545267
    */
-  if (do_fork)
+#ifndef DBUS_WIN
+   if (do_fork)
     {
       pid_t pid = fork ();
       if (pid != 0)
         exit (0);
       sleep (1);
     }
+#endif
 
   dbus_error_init (&error);
   connection = dbus_bus_get (DBUS_BUS_STARTER, &error);
@@ -470,7 +477,14 @@ main (int    argc,
       dbus_error_free (&error);
       exit (1);
     }
-  
+
+  if (result != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER)
+    {
+      fprintf (stderr, "Unable to acquire service: code %d\n", result);
+      _dbus_verbose ("*** Failed to acquire service: %d\n", result);
+      exit (1);
+    }
+
   _dbus_verbose ("*** Test service entering main loop\n");
   _dbus_loop_run (loop);