From: Simon McVittie Date: Fri, 17 Feb 2017 17:10:19 +0000 (+0000) Subject: config-parser: Simplify test for standard session service dirs X-Git-Tag: dbus-1.11.12~48 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5476b8fad009dc8587184ea61f27d7b48eb6a036;p=thirdparty%2Fdbus.git config-parser: Simplify test for standard session service dirs There's little point in asserting that the defaults (without setting XDG_DATA_HOME, etc.) end with share/dbus-1/services, because we are about to re-test with known values for XDG_DATA_HOME etc., at which point we can check exact values which is more strict. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99825 Reviewed-by: Philip Withnall Signed-off-by: Simon McVittie --- diff --git a/bus/config-parser.c b/bus/config-parser.c index e3c6f1a8f..17fc60e9e 100644 --- a/bus/config-parser.c +++ b/bus/config-parser.c @@ -3440,27 +3440,6 @@ test_default_session_servicedirs (void) dirs = NULL; printf ("Testing retrieving the default session service directories\n"); - if (!_dbus_get_standard_session_servicedirs (&dirs)) - _dbus_assert_not_reached ("couldn't get stardard dirs"); - - /* make sure our defaults end with share/dbus-1/service */ - while ((link = _dbus_list_pop_first_link (&dirs))) - { - DBusString path; - - printf (" default service dir: %s\n", (char *)link->data); - _dbus_string_init_const (&path, (char *)link->data); - if (!_dbus_string_ends_with_c_str (&path, "dbus-1/services")) - { - printf ("error with default session service directories\n"); - dbus_free (link->data); - _dbus_list_free_link (link); - goto out; - } - - dbus_free (link->data); - _dbus_list_free_link (link); - } #ifdef DBUS_UNIX if (!dbus_setenv ("XDG_DATA_HOME", "/testhome/foo/.testlocal/testshare"))