diff options
author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-04-27 17:59:35 +0100 |
---|---|---|
committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-04-27 17:59:35 +0100 |
commit | 0e501b30910b98fa0eb58266b0a09f7f369f08d8 (patch) | |
tree | 0114e897828257a137652b3aee9d993fb55481c2 /bus | |
parent | 338678757cad266f52368d6bb5eb11b9f847b9db (diff) | |
parent | 8e333e682aeb7be5ed63e5fbcc5eb0376ad9e59a (diff) | |
download | dbus-0e501b30910b98fa0eb58266b0a09f7f369f08d8.tar.gz |
Merge branch 'dbus-1.4'
Diffstat (limited to 'bus')
-rw-r--r-- | bus/test-main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/bus/test-main.c b/bus/test-main.c index cab75306..a8039d51 100644 --- a/bus/test-main.c +++ b/bus/test-main.c @@ -54,6 +54,8 @@ check_memleaks (const char *name) } #endif /* DBUS_BUILD_TESTS */ +static DBusInitialFDs *initial_fds = NULL; + static void test_pre_hook (void) { @@ -62,16 +64,21 @@ test_pre_hook (void) && (!bus_selinux_pre_init () || !bus_selinux_full_init ())) die ("could not init selinux support"); + + initial_fds = _dbus_check_fdleaks_enter (); } static char *progname = ""; + static void test_post_hook (void) { if (_dbus_getenv ("DBUS_TEST_SELINUX")) bus_selinux_shutdown (); check_memleaks (progname); - _dbus_check_fdleaks(); + + _dbus_check_fdleaks_leave (initial_fds); + initial_fds = NULL; } int |