Attachment 85077 Details for Bug 68852 – 6/6] test/dbus-daemon, test/dbus-daemon-eavesdrop: allow external dbus-daemon

[patch] 6/6] test/dbus-daemon, test/dbus-daemon-eavesdrop: allow external dbus-daemon

0006-test-dbus-daemon-test-dbus-daemon-eavesdrop-allow-ex.patch (text/plain), 2.31 KB, created by Simon McVittie on 2013-09-02 16:24:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2013-09-02 16:24:31 UTC

Size: 2.31 KB

patch

obsolete

>From 0fc049216730200aca2ef4082767c40f18fdf5bc Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 2 Sep 2013 16:36:46 +0100
>Subject: [PATCH 6/6] test/dbus-daemon, test/dbus-daemon-eavesdrop: allow
> external dbus-daemon
>
>It's easier to automate these tests if they launch their own
>dbus-daemon, but easier to debug them if they don't: you can launch
>a dbus-daemon separately, under gdb. However, tests that need a
>specially-configured dbus-daemon will have to be skipped.
>---
> test/dbus-daemon-eavesdrop.c |  9 ++++++++-
> test/dbus-daemon.c           | 17 ++++++++++++++++-
> 2 files changed, 24 insertions(+), 2 deletions(-)
>
>diff --git a/test/dbus-daemon-eavesdrop.c b/test/dbus-daemon-eavesdrop.c
>index 2c45f54..bc5ba12 100644
>--- a/test/dbus-daemon-eavesdrop.c
>+++ b/test/dbus-daemon-eavesdrop.c
>@@ -409,7 +409,14 @@ setup (Fixture *f,
>       config = g_strdup ("--session");
>     }
> 
>-  address = spawn_dbus_daemon (dbus_daemon, config, &f->daemon_pid);
>+  if (g_getenv ("DBUS_TEST_DAEMON_ADDRESS") != NULL)
>+    {
>+      address = g_strdup (g_getenv ("DBUS_TEST_DAEMON_ADDRESS"));
>+    }
>+  else
>+    {
>+      address = spawn_dbus_daemon (dbus_daemon, config, &f->daemon_pid);
>+    }
> 
>   g_free (dbus_daemon);
>   g_free (config);
>diff --git a/test/dbus-daemon.c b/test/dbus-daemon.c
>index 22ea23e..c883425 100644
>--- a/test/dbus-daemon.c
>+++ b/test/dbus-daemon.c
>@@ -194,6 +194,14 @@ setup (Fixture *f,
> 
>   if (config != NULL && config->config_file != NULL)
>     {
>+      if (g_getenv ("DBUS_TEST_DAEMON_ADDRESS") != NULL)
>+        {
>+          g_message ("SKIP: cannot use DBUS_TEST_DAEMON_ADDRESS for "
>+              "unusally-configured dbus-daemon");
>+          f->skip = TRUE;
>+          return;
>+        }
>+
>       if (g_getenv ("DBUS_TEST_DATA") == NULL)
>         {
>           g_message ("SKIP: set DBUS_TEST_DATA to a directory containing %s",
>@@ -227,7 +235,14 @@ setup (Fixture *f,
>   if (dbus_daemon == NULL)
>     dbus_daemon = g_strdup ("dbus-daemon");
> 
>-  address = spawn_dbus_daemon (dbus_daemon, arg, &f->daemon_pid);
>+  if (g_getenv ("DBUS_TEST_DAEMON_ADDRESS") != NULL)
>+    {
>+      address = g_strdup (g_getenv ("DBUS_TEST_DAEMON_ADDRESS"));
>+    }
>+  else
>+    {
>+      address = spawn_dbus_daemon (dbus_daemon, arg, &f->daemon_pid);
>+    }
> 
>   g_free (dbus_daemon);
>   g_free (arg);
>-- 
>1.8.4.rc3
>

Actions: View | Splinter Review

Attachments on bug 68852: 85071 | 85072 | 85073 | 85074 | 85076 | 85077 | 85082 | 85109 | 85110 | 85240 | 85604

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.