X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2FMakefile.am;h=a4d5e74a335a0fa9be450f8b6f3c6958c3f2d7de;hb=e4f8f3b95c2a3b4188a38378bd30b548dba505c2;hp=a3507aa302cd71e22d82ecee6b53cb366e7957b5;hpb=348da88e27677d67b93c11d0f24391453783017a;p=platform%2Fupstream%2Fglib.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a3507aa..a4d5e74 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS=gobject
+SUBDIRS=gobject refcount
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule $(GLIB_DEBUG_FLAGS)
 
@@ -49,13 +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)
-unicode_collate_LDADD = $(libglib)
+errorcheck_mutex_test_LDADD = $(libglib) $(libgthread)
 if ENABLE_TIMELOOP
 timeloop_LDADD = $(libglib)
 timeloop_closure_LDADD = $(libglib) $(libgobject)
@@ -64,9 +64,11 @@ endif
 test_programs =					\
 	atomic-test				\
 	array-test				\
+	base64-test				\
 	$(CXX_TEST)				\
 	child-test				\
 	completion-test				\
+	convert-test				\
 	date-test				\
 	dirname-test				\
 	file-test				\
@@ -77,6 +79,7 @@ test_programs =					\
 	keyfile-test				\
 	list-test				\
 	mainloop-test				\
+	mapping-test				\
 	markup-escape-test			\
 	module-test				\
 	node-test				\
@@ -84,11 +87,14 @@ test_programs =					\
 	patterntest				\
 	printf-test				\
 	queue-test				\
+	asyncqueue-test				\
 	qsort-test				\
 	rand-test				\
 	relation-test				\
 	shell-test				\
 	slist-test				\
+	slice-test				\
+	slice-color				\
 	spawn-test				\
 	$(spawn_test_win32_gui)			\
 	strfunc-test				\
@@ -101,18 +107,20 @@ test_programs =					\
 	unicode-caseconv			\
 	unicode-encoding			\
 	utf8-validate				\
+	utf8-pointer				\
 	uri-test
 
-test_scripts = run-markup-tests.sh
+test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh
 
-test_script_support_programs = markup-test
+test_script_support_programs = markup-test unicode-collate bookmarkfile-test
 
 check_PROGRAMS = $(test_programs) $(test_script_support_programs)
 
 TESTS = $(test_programs) $(test_scripts)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
 	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \
-	MALLOC_CHECK_=2
+	MALLOC_CHECK_=2	\
+	MALLOC_PERTURB_=$$(($$RANDOM % 256))
 
 progs_ldadd = $(EFENCE) $(libglib) $(EFENCE)
 thread_ldadd = $(libgthread) $(G_THREAD_LIBS) $(progs_ldadd)
@@ -120,8 +128,11 @@ 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)
+convert_test_LDADD = $(progs_ldadd)
 date_test_LDADD = $(progs_ldadd)
 dirname_test_LDADD = $(progs_ldadd)
 file_test_LDADD = $(progs_ldadd)
@@ -133,6 +144,7 @@ keyfile_test_LDADD = $(progs_ldadd)
 list_test_LDADD = $(progs_ldadd)
 mainloop_test_LDADD = $(thread_ldadd)
 markup_test_LDADD = $(progs_ldadd)
+mapping_test_LDADD = $(progs_ldadd)
 markup_escape_test_LDADD = $(progs_ldadd)
 module_test_LDADD = $(module_ldadd) $(module_test_exp)
 module_test_LDFLAGS = $(G_MODULE_LDFLAGS)
@@ -140,11 +152,16 @@ node_test_LDADD = $(progs_ldadd)
 option_test_LDADD = $(progs_ldadd)
 printf_test_LDADD = $(progs_ldadd)
 queue_test_LDADD = $(progs_ldadd)
+asyncqueue_test_LDADD = $(thread_ldadd)
 qsort_test_LDADD = $(progs_ldadd)
 rand_test_LDADD = $(progs_ldadd)
 relation_test_LDADD = $(progs_ldadd)
 shell_test_LDADD = $(progs_ldadd)
 slist_test_LDADD = $(progs_ldadd)
+slice_test_SOURCES = slice-test.c memchunks.c
+slice_test_LDADD = $(thread_ldadd)
+slice_color_SOURCES = slice-color.c memchunks.c
+slice_color_LDADD = $(thread_ldadd)
 spawn_test_LDADD = $(progs_ldadd)
 strfunc_test_LDADD = $(progs_ldadd)
 string_test_LDADD = $(progs_ldadd)
@@ -155,7 +172,9 @@ tree_test_LDADD = $(progs_ldadd)
 type_test_LDADD = $(progs_ldadd)
 unicode_encoding_LDADD = $(progs_ldadd)
 unicode_caseconv_LDADD = $(progs_ldadd)
+unicode_collate_LDADD = $(progs_ldadd)
 utf8_validate_LDADD = $(progs_ldadd)
+utf8_pointer_LDADD = $(progs_ldadd)
 uri_test_LDADD = $(progs_ldadd)
 
 lib_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
@@ -179,7 +198,16 @@ dist-hook: $(BUILT_EXTRA_DIST)
 	  cp $$d/$$f $(distdir) || exit 1; done
 	mkdir $(distdir)/markups;          \
 	for f in $(srcdir)/markups/* ; do  \
-	  cp $$f $(distdir)/markups;       \
-	done
-
-DISTCLEANFILES = iochannel-test-outfile
+	  cp $$f $(distdir)/markups; done 
+	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 \
+		maptest \
+		mapchild \
+		collate.out