diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-11-03 12:22:43 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-11-19 15:34:58 +0000 |
| commit | 18a6eb96849b1931f478bfba0823f0c5a7d24fbe (patch) | |
| tree | b838e0063312f30e759b83232b03c0395d2e5075 /dbus | |
| parent | 82c724ab629d7aaea7f7461c375407ac41c0c09a (diff) | |
| download | dbus-glib-18a6eb96849b1931f478bfba0823f0c5a7d24fbe.tar.gz | |
Turn _dbus_glib_test into a standalone test case, since it only tests public API
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711
Reviewed-by: Dan Williams <dcbw@redhat.com>
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-glib.c | 29 | ||||
| -rw-r--r-- | dbus/dbus-gtest.c | 4 | ||||
| -rw-r--r-- | dbus/dbus-gtest.h | 1 |
3 files changed, 0 insertions, 34 deletions
diff --git a/dbus/dbus-glib.c b/dbus/dbus-glib.c index 4ca8db6..df36ecf 100644 --- a/dbus/dbus-glib.c +++ b/dbus/dbus-glib.c @@ -367,32 +367,3 @@ dbus_g_message_get_message (DBusGMessage *gmessage) { return DBUS_MESSAGE_FROM_G_MESSAGE (gmessage); } - -#ifdef DBUS_BUILD_TESTS - -/* - * Unit test for general glib stuff - * Returns: %TRUE on success. - */ -gboolean -_dbus_glib_test (const char *test_data_dir) -{ - DBusError err; - GError *gerror = NULL; - - dbus_error_init (&err); - dbus_set_error_const (&err, DBUS_ERROR_NO_MEMORY, "Out of memory!"); - - dbus_set_g_error (&gerror, &err); - g_assert (gerror != NULL); - g_assert (gerror->domain == DBUS_GERROR); - g_assert (gerror->code == DBUS_GERROR_NO_MEMORY); - g_assert (!strcmp (gerror->message, "Out of memory!")); - - dbus_error_init (&err); - g_clear_error (&gerror); - - return TRUE; -} - -#endif /* DBUS_BUILD_TESTS */ diff --git a/dbus/dbus-gtest.c b/dbus/dbus-gtest.c index 9783efd..59dbe5b 100644 --- a/dbus/dbus-gtest.c +++ b/dbus/dbus-gtest.c @@ -67,10 +67,6 @@ dbus_glib_internal_do_not_use_run_tests (const char *test_data_dir) if (!_dbus_gvalue_test (test_data_dir)) die ("gvalue utils"); - printf ("%s: running glib tests\n", "dbus-glib-test"); - if (!_dbus_glib_test (test_data_dir)) - die ("glib"); - printf ("%s: running mainloop integration tests\n", "dbus-glib-test"); if (!_dbus_gmain_test (test_data_dir)) die ("gmain"); diff --git a/dbus/dbus-gtest.h b/dbus/dbus-gtest.h index 7a57b51..b94f506 100644 --- a/dbus/dbus-gtest.h +++ b/dbus/dbus-gtest.h @@ -29,7 +29,6 @@ gboolean _dbus_gmain_test (const char *test_data_dir); gboolean _dbus_gobject_test (const char *test_data_dir); gboolean _dbus_gutils_test (const char *test_data_dir); -gboolean _dbus_glib_test (const char *test_data_dir); gboolean _dbus_gvalue_test (const char *test_data_dir); gboolean _dbus_gvalue_utils_test (const char *test_data_dir); |