Renamed to glib/gthreadprivate.h and moved system thread identifier

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 9c14f85..a4d5e74 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,12 +49,13 @@ endif
 if ENABLE_TIMELOOP
 timeloop = timeloop timeloop-closure
 endif
-noinst_PROGRAMS = testglib testgdate testgdateparser unicode-normalize unicode-collate $(timeloop)
+noinst_PROGRAMS = testglib testgdate testgdateparser unicode-normalize unicode-collate $(timeloop) errorcheck-mutex-test
 testglib_LDADD = $(libglib)
 patterntest_LDADD = $(libglib)
 testgdate_LDADD = $(libglib)
 testgdateparser_LDADD = $(libglib)
 unicode_normalize_LDADD = $(libglib)
+errorcheck_mutex_test_LDADD = $(libglib) $(libgthread)
 if ENABLE_TIMELOOP
 timeloop_LDADD = $(libglib)
 timeloop_closure_LDADD = $(libglib) $(libgobject)
@@ -63,7 +64,7 @@ endif
 test_programs =                                        \
        atomic-test                             \
        array-test                              \
-       bookmarkfile-test                               \
+       base64-test                             \
        $(CXX_TEST)                             \
        child-test                              \
        completion-test                         \
@@ -109,9 +110,9 @@ test_programs =                                     \
        utf8-pointer                            \
        uri-test
 
-test_scripts = run-markup-tests.sh run-collate-tests.sh
+test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh
 
-test_script_support_programs = markup-test unicode-collate
+test_script_support_programs = markup-test unicode-collate bookmarkfile-test
 
 check_PROGRAMS = $(test_programs) $(test_script_support_programs)
 
@@ -127,6 +128,7 @@ module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 
 atomic_test_LDADD = $(progs_ldadd)
 array_test_LDADD = $(progs_ldadd)
+base64_test_LDADD = $(progs_ldadd)
 bookmarkfile_test_LDADD = $(progs_ldadd)
 child_test_LDADD = $(thread_ldadd)
 completion_test_LDADD = $(progs_ldadd)
@@ -200,6 +202,9 @@ 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 \
                file-test-get-contents \