fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-06 08:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

test/dbus-daemon, test/dbus-daemon-eavesdrop: allow external dbus-daemon

Browse source 
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 <ralf.habacker@freenet.de>
This commit is contained in:
Simon McVittie 2013-09-02 16:36:46 +01:00 • committed by Ralf Habacker
parent e09eb12683
commit e74f0b1efa
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
test/dbus-daemon-eavesdrop.c
View file

@ -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);

17
test/dbus-daemon.c
View file

@ -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);