Skip to content
Snippets Groups Projects
Commit 3063c695 authored by Simon McVittie's avatar Simon McVittie
Browse files

Make tests cope with older GLib

parent c8216c90
No related branches found
No related tags found
No related merge requests found
...@@ -63,4 +63,16 @@ gboolean glnx_set_object (GObject **object_ptr, ...@@ -63,4 +63,16 @@ gboolean glnx_set_object (GObject **object_ptr,
#endif /* !GLIB_CHECK_VERSION(2, 44, 0) */ #endif /* !GLIB_CHECK_VERSION(2, 44, 0) */
#ifndef g_assert_nonnull
#define g_assert_nonnull(x) g_assert (x != NULL)
#endif
#ifndef g_assert_null
#define g_assert_null(x) g_assert (x == NULL)
#endif
#if !GLIB_CHECK_VERSION (2, 38, 0)
#define g_test_skip(s) g_test_message ("SKIP: %s", s)
#endif
G_END_DECLS G_END_DECLS
...@@ -218,7 +218,11 @@ test_xattr_races (void) ...@@ -218,7 +218,11 @@ test_xattr_races (void)
/* FIXME - this deadlocks for me on 4.9.4-201.fc25.x86_64, whether /* FIXME - this deadlocks for me on 4.9.4-201.fc25.x86_64, whether
* using overlayfs or xfs as source/dest. * using overlayfs or xfs as source/dest.
*/ */
#if GLIB_CHECK_VERSION (2, 36, 0)
const guint nprocs = MAX (4, g_get_num_processors ()); const guint nprocs = MAX (4, g_get_num_processors ());
#else
const guint nprocs = 4;
#endif
struct XattrWorker wdata[nprocs]; struct XattrWorker wdata[nprocs];
GThread *threads[nprocs]; GThread *threads[nprocs];
g_autoptr(GError) local_error = NULL; g_autoptr(GError) local_error = NULL;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment