Commit e74f0b1e authored by Simon McVittie's avatar Simon McVittie Committed by Ralf Habacker
Browse files

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.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68852

Reviewed-by: Ralf Habacker's avatarRalf Habacker <ralf.habacker@freenet.de>
parent e09eb126
......@@ -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);
......
......@@ -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);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment