[patch][core] Fix test_default_session_servicedirs on Unix
ralf.habacker at freenet.de
Tue May 22 12:56:16 PDT 2007
Ralf Habacker schrieb:
> Simon McVittie schrieb:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>> bus/config-parser.c r1.50 reordered the expected order of service directories
>> on Unix (breaking the test), apparently in the interests of simplifying the
>> Unix vs Windows #ifdefs. This patch reverts the re-ordering to make the test
>> pass again.
> Sorry for breaking this. We initial had not changed the ordering. The
> reordering was suggested by Havoc
>> Also, r1.50 added some calls to _dbus_string_free for a DBusString
>> that's only initialized on Windows (well, strictly speaking: when
>> $CommonProgramFiles is in the environment). Rather than making the
>> _dbus_string_free conditional, I've just moved the initialization of the
>> DBusString outside the Windows-specific code.
>> Finally, I've ensured that the Windows-specific code is only run if, in
>> fact, running Windows (and not if a Unix user happens to have
>> $CommonProgramFiles in their environment for some reason).
Thanks for this after commit review. It helps very much that someone on
the unix side reviews the patch using this pragmatically way. :-)
>> make check and make distcheck now pass on Unix - Ralf, could you check
>> that I haven't broken the tests on Windows?
No problems with this patch on windows. Should I commit it ?
More information about the dbus