diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-05 13:28:54 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-08 12:17:28 +0100 |
| commit | 2ab900b678abb6df62790549b55230215f20a8a4 (patch) | |
| tree | 09ab594b96e00f1852f32778565a23ced44aaf84 /test/internals | |
| parent | 60511bb9951c210b82e14f8b5b1a10a744acf6bc (diff) | |
| download | dbus-2ab900b678abb6df62790549b55230215f20a8a4.tar.gz | |
Do not suppress syslog test's stderr just because init is systemd
This causes the test to fail. The assumption implicitly being made was
"if pid 1 is systemd, then every caller of _dbus_init_system_log() is a
systemd service" which is not valid for the regression test.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=63163
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Colin Walters <walters@verbum.org>
Diffstat (limited to 'test/internals')
| -rw-r--r-- | test/internals/syslog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/internals/syslog.c b/test/internals/syslog.c index 4f6b7c22..658281cb 100644 --- a/test/internals/syslog.c +++ b/test/internals/syslog.c @@ -54,7 +54,7 @@ test_syslog (Fixture *f, { if (g_test_trap_fork (0, 0)) { - _dbus_init_system_log (); + _dbus_init_system_log (FALSE); _dbus_system_log (DBUS_SYSTEM_LOG_FATAL, MESSAGE "%d", 23); /* should not be reached: exit 0 so the assertion in the main process * will fail */ @@ -66,7 +66,7 @@ test_syslog (Fixture *f, if (g_test_trap_fork (0, 0)) { - _dbus_init_system_log (); + _dbus_init_system_log (FALSE); _dbus_system_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "%d", 42); _dbus_system_log (DBUS_SYSTEM_LOG_SECURITY, MESSAGE "%d", 666); exit (0); @@ -76,7 +76,7 @@ test_syslog (Fixture *f, g_test_trap_assert_stderr ("*" MESSAGE "42\n*" MESSAGE "666\n*"); /* manual test (this is the best we can do on Windows) */ - _dbus_init_system_log (); + _dbus_init_system_log (FALSE); _dbus_system_log (DBUS_SYSTEM_LOG_INFO, MESSAGE "%d", 42); _dbus_system_log (DBUS_SYSTEM_LOG_SECURITY, MESSAGE "%d", 666); } |