From 7d8609ed8f6bfe38ddf0b1afacce229b7db7ee14 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Mon, 9 Nov 2015 04:39:45 +0100
Subject: [PATCH] Fix test-bus segfault_service_no_auto_start test on windows.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=92721
---
 bus/dispatch.c | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/bus/dispatch.c b/bus/dispatch.c
index 5f930a2..9ea1aaa 100644
--- a/bus/dispatch.c
+++ b/bus/dispatch.c
@@ -2926,7 +2926,6 @@ check_existent_service_no_auto_start (BusContext     *context,
   return retval;
 }
 
-#ifndef DBUS_WIN_FIXME
 /* returns TRUE if the correct thing happens,
  * but the correct thing may include OOM errors.
  */
@@ -3020,6 +3019,13 @@ check_segfault_service_no_auto_start (BusContext     *context,
         {
           ; /* good, this is expected also */
         }
+#ifdef DBUS_WIN
+      else if (dbus_message_is_error (message,
+                                      DBUS_ERROR_SPAWN_CHILD_EXITED))
+        {
+          ; /* good, this is expected also */
+        }
+#endif
       else
         {
           warn_unexpected (connection, message, "not this error");
@@ -3113,6 +3119,13 @@ check_segfault_service_auto_start (BusContext     *context,
         {
           ; /* good, this is expected also */
         }
+#ifdef DBUS_WIN
+      else if (dbus_message_is_error (message,
+                                      DBUS_ERROR_SPAWN_CHILD_EXITED))
+        {
+          ; /* good, this is expected also */
+        }
+#endif
       else
         {
           warn_unexpected (connection, message, "not this error");
@@ -3134,7 +3147,6 @@ check_segfault_service_auto_start (BusContext     *context,
 
   return retval;
 }
-#endif
 
 #define TEST_ECHO_MESSAGE "Test echo message"
 #define TEST_RUN_HELLO_FROM_SELF_MESSAGE "Test sending message to self"
@@ -4849,12 +4861,8 @@ bus_dispatch_test_conf (const DBusString *test_data_dir,
   check2_try_iterations (context, foo, "nonexistent_service_no_auto_start",
                          check_nonexistent_service_no_auto_start);
 
-#ifdef DBUS_WIN_FIXME
-  _dbus_warn("TODO: dispatch.c segfault_service_no_auto_start test\n");
-#else
   check2_try_iterations (context, foo, "segfault_service_no_auto_start",
                          check_segfault_service_no_auto_start);
-#endif
 
   check2_try_iterations (context, foo, "existent_service_no_auto_start",
                          check_existent_service_no_auto_start);
@@ -4862,14 +4870,9 @@ bus_dispatch_test_conf (const DBusString *test_data_dir,
   check2_try_iterations (context, foo, "nonexistent_service_auto_start",
                          check_nonexistent_service_auto_start);
 
-
-#ifdef DBUS_WIN_FIXME
-  _dbus_warn("TODO: dispatch.c segfault_service_auto_start test\n");
-#else
   /* only do the segfault test if we are not using the launcher */
   check2_try_iterations (context, foo, "segfault_service_auto_start",
                          check_segfault_service_auto_start);
-#endif
 
   /* only do the shell fail test if we are not using the launcher */
   check2_try_iterations (context, foo, "shell_fail_service_auto_start",
-- 
1.8.4.5