提交 0c2ec1d7 编写于 作者: B Behdad Esfahbod

[test] Always initialize gthread such that our mutex() stuff is tested

Now the test/object test deadlocks as expected.  Fix coming.
上级 6a9093cc
......@@ -58,6 +58,7 @@ fi
dnl ==========================================================================
PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, have_glib=true, have_glib=false)
PKG_CHECK_MODULES(GTHREAD, gthread-2.0, , have_glib=false)
if $have_glib; then
AC_DEFINE(HAVE_GLIB, 1, [Have glib2 library])
fi
......
......@@ -3,8 +3,8 @@ include Makefile.decl
NULL =
if HAVE_GLIB
AM_CPPFLAGS = -I$(top_srcdir)/src/ $(GLIB_CFLAGS)
LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS)
AM_CPPFLAGS = -I$(top_srcdir)/src/ $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) $(GTHREAD_LIBS)
EXTRA_DIST += hb-test.h
......
......@@ -54,6 +54,7 @@ HB_BEGIN_DECLS
static inline void
hb_test_init (int *argc, char ***argv)
{
g_thread_init (NULL);
g_test_init (argc, argv, NULL);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册