Attachment 131830 Details for Bug 101362 – 1/3] Bump GLib dependency for tests to 2.40

[patch] 1/3] Bump GLib dependency for tests to 2.40

0001-Bump-GLib-dependency-for-tests-to-2.40.patch (text/plain), 2.40 KB, created by Simon McVittie on 2017-06-09 18:18:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2017-06-09 18:18:18 UTC

Size: 2.40 KB

patch

obsolete

>From afbbdde89f257cb96eaf0988ffa838b203cf21a8 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <smcv@collabora.com>
>Date: Fri, 9 Jun 2017 14:46:32 +0100
>Subject: [PATCH 1/3] 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.
>
>Signed-off-by: Simon McVittie <smcv@collabora.com>
>---
> configure.ac           | 4 ++--
> test/internals/refs.c  | 5 -----
> test/test-utils-glib.h | 8 --------
> 3 files changed, 2 insertions(+), 15 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index b05c708b..dcfcb4e8 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -263,13 +263,13 @@ fi
> # or binaries.
> 
> AC_DEFINE([GLIB_VERSION_MIN_REQUIRED], [GLIB_VERSION_2_36], [Ignore post-2.36 deprecations])
>-AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_38], [Prevent post-2.38 APIs])
>+AC_DEFINE([GLIB_VERSION_MAX_ALLOWED], [GLIB_VERSION_2_40], [Prevent post-2.40 APIs])
> 
> with_glib=yes
> 
> AS_IF([test "x$enable_modular_tests" != xno],
>   [
>-  PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.36, gio-2.0 >= 2.36],
>+  PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.40, gio-2.0 >= 2.40],
>     [
>       AS_IF([test "x$dbus_unix" = xyes],
>         [PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0],
>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);
>-- 
>2.11.0
>

Actions: View | Splinter Review

Attachments on bug 101362: 131830 | 131831 | 131832

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.