diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-06-09 14:46:32 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-06-12 11:40:18 +0100 |
| commit | 8821af59c8b94fdc22b1ed1217cbce80791b4222 (patch) | |
| tree | 9340fe99a6567622978b69a94d9f47dffa00490d /test | |
| parent | e98d907f7e3c391dd20aac2409a89b2681c847fa (diff) | |
| download | dbus-8821af59c8b94fdc22b1ed1217cbce80791b4222.tar.gz | |
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 <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=101362
Diffstat (limited to 'test')
| -rw-r--r-- | test/internals/refs.c | 5 | ||||
| -rw-r--r-- | test/test-utils-glib.h | 8 |
2 files changed, 0 insertions, 13 deletions
diff --git a/test/internals/refs.c b/test/internals/refs.c index a4656622..f9776378 100644 --- a/test/internals/refs.c +++ b/test/internals/refs.c @@ -80,11 +80,6 @@ typedef struct { VoidFunc unlock; } Thread; -/* provide backwards compatibility shim when building with a glib <= 2.30.x */ -#if !GLIB_CHECK_VERSION(2,31,0) -#define g_thread_new(name,func,data) g_thread_create(func,data,TRUE,NULL) -#endif - static gpointer ref_thread (gpointer data) { 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); |