From 8821af59c8b94fdc22b1ed1217cbce80791b4222 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 9 Jun 2017 14:46:32 +0100 Subject: Bump GLib dependency for tests to 2.40 This is quite old (it's the version in Ubuntu 14.04 LTS, and older than the version in Debian 8) but gives us g_test_skip(), g_test_trap_subprocess() and GVariantDict, all of which will be useful in the regression tests. Remove workarounds for old versions. After this commit we are still using the deprecated g_test_trap_fork(), which will be removed in a subsequent commit. Don't opt-in to the new deprecation warnings from 2.38 and 2.40 yet, because under our recommended settings for dbus developers (-Werror) they would break the build. Signed-off-by: Simon McVittie Reviewed-by: Philip Withnall Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101362 --- test/test-utils-glib.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'test/test-utils-glib.h') diff --git a/test/test-utils-glib.h b/test/test-utils-glib.h index d4b2e614..2e1073f0 100644 --- a/test/test-utils-glib.h +++ b/test/test-utils-glib.h @@ -84,14 +84,6 @@ void test_init (int *argcp, char ***argvp); void test_progress (char symbol); -#if !GLIB_CHECK_VERSION (2, 38, 0) -#define g_test_skip(s) my_test_skip (s) -static inline void my_test_skip (const gchar *s) -{ - g_test_message ("SKIP: %s", s); -} -#endif - void test_remove_if_exists (const gchar *path); void test_rmdir_must_exist (const gchar *path); void test_rmdir_if_exists (const gchar *path); -- cgit v1.2.1