asyncqueue: improve test coverage

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6d5c102..307bc31 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -3,9 +3,7 @@ include $(top_srcdir)/Makefile.decl
 SUBDIRS=gobject refcount
 
 AM_CPPFLAGS =                          \
-       -I$(top_srcdir)                 \
-       -I$(top_srcdir)/glib            \
-       -I$(top_srcdir)/gmodule         \
+       $(gmodule_INCLUDES)             \
        $(GLIB_DEBUG_FLAGS)
 
 AM_CFLAGS = -g
@@ -75,6 +73,7 @@ testglib_LDADD                 = $(libglib)
 testgdate_LDADD = $(libglib)
 testgdateparser_LDADD = $(libglib)
 unicode_normalize_LDADD = $(libglib)
+unicode_collate_LDADD = $(libglib)
 errorcheck_mutex_test_LDADD = $(libglib) $(libgthread) $(G_THREAD_LIBS) 
 assert_msg_test_LDADD = $(libglib)
 if ENABLE_TIMELOOP
@@ -112,9 +111,9 @@ test_programs =                                     \
        unicode-caseconv                        \
        unicode-encoding
 
-test_scripts = run-collate-tests.sh run-bookmark-test.sh run-assert-msg-test.sh
+test_scripts = run-collate-tests.sh run-assert-msg-test.sh
 
-test_script_support_programs = unicode-collate bookmarkfile-test
+test_script_support_programs = unicode-collate
 
 check_PROGRAMS = $(test_programs) $(test_script_support_programs)
 
@@ -130,16 +129,13 @@ module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 
 atomic_test_LDADD = $(progs_ldadd)
 bit_test_LDADD = $(progs_ldadd)
-bookmarkfile_test_LDADD = $(progs_ldadd)
 child_test_LDADD = $(thread_ldadd)
 completion_test_LDADD = $(progs_ldadd)
-date_test_LDADD = $(progs_ldadd)
 dirname_test_LDADD = $(progs_ldadd)
 file_test_LDADD = $(progs_ldadd)
 env_test_LDADD = $(progs_ldadd)
 gio_test_LDADD = $(progs_ldadd)
 iochannel_test_LDADD = $(progs_ldadd)
-list_test_LDADD = $(progs_ldadd)
 mainloop_test_LDADD = $(thread_ldadd)
 mapping_test_LDADD = $(progs_ldadd)
 module_test_LDADD = $(module_ldadd) $(module_test_exp)
@@ -162,7 +158,6 @@ threadpool_test_LDADD = $(thread_ldadd)
 type_test_LDADD = $(progs_ldadd)
 unicode_encoding_LDADD = $(progs_ldadd)
 unicode_caseconv_LDADD = $(progs_ldadd)
-unicode_collate_LDADD = $(progs_ldadd)
 
 noinst_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
 
@@ -182,9 +177,6 @@ dist-hook: $(BUILT_EXTRA_DIST)
        mkdir $(distdir)/collate;                               \
        for f in $(srcdir)/collate/* ; do                       \
           if test -f $$f; then cp $$f $(distdir)/collate; fi; done
-       mkdir $(distdir)/bookmarks;                             \
-       for f in $(srcdir)/bookmarks/* ; do                     \
-         cp $$f $(distdir)/bookmarks; done 
 
 DISTCLEANFILES =               \
        iochannel-test-outfile  \