From dbd5ce93c067a839bd151bf3c806136440d1bdcf Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Tue, 31 May 2011 14:59:03 +0100 Subject: [PATCH 3/4] Remove _dbus_gutils_test, which didn't test anything --- dbus/dbus-gtest.c | 6 +----- dbus/dbus-gutils.c | 17 ----------------- 2 files changed, 1 insertions(+), 22 deletions(-) diff --git a/dbus/dbus-gtest.c b/dbus/dbus-gtest.c index dead0db..b5629da 100644 --- a/dbus/dbus-gtest.c +++ b/dbus/dbus-gtest.c @@ -70,11 +70,7 @@ dbus_glib_internal_do_not_use_run_tests (const char *test_data_dir) printf ("%s: running glib tests\n", "dbus-glib-test"); if (!_dbus_glib_test (test_data_dir)) die ("glib"); - - printf ("%s: running utils tests\n", "dbus-glib-test"); - if (!_dbus_gutils_test (test_data_dir)) - die ("gutils"); - + printf ("%s: running mainloop integration tests\n", "dbus-glib-test"); if (!_dbus_gmain_test (test_data_dir)) die ("gmain"); diff --git a/dbus/dbus-gutils.c b/dbus/dbus-gutils.c index e882282..0fb744d 100644 --- a/dbus/dbus-gutils.c +++ b/dbus/dbus-gutils.c @@ -110,21 +110,4 @@ _dbus_gutils_wincaps_to_uscore (const char *caps) return g_string_free (str, FALSE); } - -#ifdef DBUS_BUILD_TESTS - -/** - * @ingroup DBusGLibInternals - * Unit test for GLib utils internals - * Returns: #TRUE on success. - */ -gboolean -_dbus_gutils_test (const char *test_data_dir) -{ - - return TRUE; -} - -#endif /* DBUS_BUILD_TESTS */ - #endif /* DOXYGEN_SHOULD_SKIP_THIS */ -- 1.7.5.3