diff options
| author | Simon McVittie <smcv@collabora.com> | 2019-06-29 16:15:55 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2019-07-02 20:44:33 +0100 |
| commit | e4e904a86b15c6a5ba5648251e316e859f0a748e (patch) | |
| tree | 83bc3f261d7cac2769e5fb1f4b5f900401992f44 /test/internals | |
| parent | 491a2da305dd3847fde6d0d26746addf7b3858f1 (diff) | |
| download | dbus-e4e904a86b15c6a5ba5648251e316e859f0a748e.tar.gz | |
tests: Improve messages when fd leaks are diagnosed
Signed-off-by: Simon McVittie <smcv@collabora.com>
Diffstat (limited to 'test/internals')
| -rw-r--r-- | test/internals/dbus-message-util.c | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/test/internals/dbus-message-util.c b/test/internals/dbus-message-util.c index 3ec62e38..df2ab8cf 100644 --- a/test/internals/dbus-message-util.c +++ b/test/internals/dbus-message-util.c @@ -884,7 +884,8 @@ verify_test_message (DBusMessage *message) } static void -verify_test_message_args_ignored (DBusMessage *message) +verify_test_message_args_ignored (DBusMessage *message, + const char *context) { DBusMessageIter iter; DBusError error = DBUS_ERROR_INIT; @@ -922,11 +923,12 @@ verify_test_message_args_ignored (DBusMessage *message) _dbus_verbose ("arguments ignored.\n"); } - _dbus_check_fdleaks_leave (initial_fds); + _dbus_check_fdleaks_leave (initial_fds, context); } static void -verify_test_message_memleak (DBusMessage *message) +verify_test_message_memleak (DBusMessage *message, + const char *context) { DBusMessageIter iter; DBusError error = DBUS_ERROR_INIT; @@ -1036,7 +1038,7 @@ verify_test_message_memleak (DBusMessage *message) _dbus_close (our_unix_fd2, &error); #endif } - _dbus_check_fdleaks_leave (initial_fds); + _dbus_check_fdleaks_leave (initial_fds, context); } /** @@ -1501,7 +1503,7 @@ _dbus_message_test (const char *test_data_dir _DBUS_GNUC_UNUSED) _dbus_message_loader_unref (loader); check_memleaks (); - _dbus_check_fdleaks_leave (initial_fds); + _dbus_check_fdleaks_leave (initial_fds, _DBUS_FILE_LINE); initial_fds = _dbus_check_fdleaks_enter (); /* Test enumeration of array elements */ @@ -1623,8 +1625,8 @@ _dbus_message_test (const char *test_data_dir _DBUS_GNUC_UNUSED) _dbus_assert (i < (int) _DBUS_N_ELEMENTS (sig)); - verify_test_message_args_ignored (message); - verify_test_message_memleak (message); + verify_test_message_args_ignored (message, _DBUS_FILE_LINE); + verify_test_message_memleak (message, _DBUS_FILE_LINE); dbus_message_unref (message); @@ -1660,7 +1662,7 @@ _dbus_message_test (const char *test_data_dir _DBUS_GNUC_UNUSED) } check_memleaks (); - _dbus_check_fdleaks_leave (initial_fds); + _dbus_check_fdleaks_leave (initial_fds, _DBUS_FILE_LINE); /* Now load every message in test_data_dir if we have one */ if (test_data_dir == NULL) @@ -1671,7 +1673,7 @@ _dbus_message_test (const char *test_data_dir _DBUS_GNUC_UNUSED) if (!foreach_message_file (test_data_dir, try_message_file, NULL)) _dbus_test_fatal ("foreach_message_file test failed"); - _dbus_check_fdleaks_leave (initial_fds); + _dbus_check_fdleaks_leave (initial_fds, _DBUS_FILE_LINE); return TRUE; } |