Disable yet another failing test that was recently added...

[platform/upstream/glib.git] / tests / Makefile.am

diff --git a/tests/Makefile.am b/tests/Makefile.am
index bba5f02..11fcb5a 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -2,18 +2,11 @@ include $(top_srcdir)/Makefile.decl
 
 SUBDIRS=gobject refcount
 
-if ENABLE_REGEX
-enable_regex = -DENABLE_REGEX
-else
-enable_regex =
-endif
-
 AM_CPPFLAGS =                          \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/glib            \
        -I$(top_srcdir)/gmodule         \
-       $(GLIB_DEBUG_FLAGS)             \
-       $(enable_regex)
+       $(GLIB_DEBUG_FLAGS)
 
 AM_CFLAGS = -g
 
@@ -71,7 +64,8 @@ noinst_PROGRAMS = $(TEST_PROGS)       \
        unicode-normalize       \
        unicode-collate         \
        $(timeloop)             \
-       errorcheck-mutex-test
+       errorcheck-mutex-test   \
+       assert-msg-test
 
 TEST_PROGS              += scannerapi
 scannerapi_SOURCES       = scannerapi.c
@@ -89,6 +83,7 @@ testgdate_LDADD = $(libglib)
 testgdateparser_LDADD = $(libglib)
 unicode_normalize_LDADD = $(libglib)
 errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS) 
+assert_msg_test_LDADD = $(libglib)
 if ENABLE_TIMELOOP
 timeloop_LDADD = $(libglib)
 timeloop_closure_LDADD = $(libglib) $(libgobject)
@@ -212,11 +207,7 @@ uri_test_LDADD = $(progs_ldadd)
 regex_test_LDADD = $(progs_ldadd)
 markup_collect_LDADD = $(progs_ldadd)
 
-lib_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
-
-# Prevent those libs from being installed
-install-libLTLIBRARIES:
-       :
+noinst_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
 
 libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c
 libmoduletestplugin_a_la_LDFLAGS = $(G_MODULE_LDFLAGS) -avoid-version -module $(no_undefined) -rpath $(libdir)