X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2FMakefile.am;h=f4ab9b398d62919a169fe92857ef6d8aa5cf2aeb;hb=0196d639753247cb0d8aca289155154ef6daa561;hp=a037772c36e602c1ac1942c035acda860c49bdd7;hpb=0163a3808c2d2e5797c388732f8fa13b4e9088f7;p=platform%2Fupstream%2Fglib.git

diff --git a/tests/Makefile.am b/tests/Makefile.am
index a037772..f4ab9b3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,6 +1,12 @@
 SUBDIRS=gobject refcount
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule $(GLIB_DEBUG_FLAGS)
+if ENABLE_REGEX
+enable_regex = -DENABLE_REGEX
+else
+enable_regex =
+endif
+
+INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule $(GLIB_DEBUG_FLAGS) $(enable_regex)
 
 EFENCE=
 
@@ -9,9 +15,9 @@ libgthread = $(top_builddir)/gthread/libgthread-2.0.la
 libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
 libgobject = $(top_builddir)/gobject/libgobject-2.0.la
 
-if PLATFORM_WIN32
 libadd_libgmodule = $(libgmodule)
 libadd_libglib = $(libglib)
+if PLATFORM_WIN32
 no_undefined = -no-undefined
 
 module_test_exp = module-test.exp
@@ -33,7 +39,8 @@ EXTRA_DIST =					\
 	gen-casefold-txt.pl			\
 	gen-casemap-txt.pl			\
 	iochannel-test-infile			\
-	utf8.txt
+	utf8.txt				\
+	timeloop-basic.c		
 
 BUILT_EXTRA_DIST =				\
 	makefile.msc
@@ -49,12 +56,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) $(G_THREAD_LIBS) 
 if ENABLE_TIMELOOP
 timeloop_LDADD = $(libglib)
 timeloop_closure_LDADD = $(libglib) $(libgobject)
@@ -64,6 +72,7 @@ test_programs =					\
 	atomic-test				\
 	array-test				\
 	base64-test				\
+	bit-test				\
 	$(CXX_TEST)				\
 	child-test				\
 	completion-test				\
@@ -90,6 +99,7 @@ test_programs =					\
 	qsort-test				\
 	rand-test				\
 	relation-test				\
+	sequence-test				\
 	shell-test				\
 	slist-test				\
 	slice-test				\
@@ -99,6 +109,7 @@ test_programs =					\
 	strfunc-test				\
 	string-test				\
 	strtod-test				\
+	strtoll-test				\
 	thread-test				\
 	threadpool-test				\
 	tree-test				\
@@ -107,7 +118,8 @@ test_programs =					\
 	unicode-encoding			\
 	utf8-validate				\
 	utf8-pointer				\
-	uri-test
+	uri-test				\
+	regex-test
 
 test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh
 
@@ -119,7 +131,7 @@ TESTS = $(test_programs) $(test_scripts)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
 	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \
 	MALLOC_CHECK_=2	\
-	MALLOC_PERTURB_=$$(($$RANDOM % 256))
+        MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
 
 progs_ldadd = $(EFENCE) $(libglib) $(EFENCE)
 thread_ldadd = $(libgthread) $(G_THREAD_LIBS) $(progs_ldadd)
@@ -128,6 +140,7 @@ module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 atomic_test_LDADD = $(progs_ldadd)
 array_test_LDADD = $(progs_ldadd)
 base64_test_LDADD = $(progs_ldadd)
+bit_test_LDADD = $(progs_ldadd)
 bookmarkfile_test_LDADD = $(progs_ldadd)
 child_test_LDADD = $(thread_ldadd)
 completion_test_LDADD = $(progs_ldadd)
@@ -155,6 +168,7 @@ asyncqueue_test_LDADD = $(thread_ldadd)
 qsort_test_LDADD = $(progs_ldadd)
 rand_test_LDADD = $(progs_ldadd)
 relation_test_LDADD = $(progs_ldadd)
+sequence_test_LDADD = $(progs_ldadd)
 shell_test_LDADD = $(progs_ldadd)
 slist_test_LDADD = $(progs_ldadd)
 slice_test_SOURCES = slice-test.c memchunks.c
@@ -165,6 +179,7 @@ spawn_test_LDADD = $(progs_ldadd)
 strfunc_test_LDADD = $(progs_ldadd)
 string_test_LDADD = $(progs_ldadd)
 strtod_test_LDADD = $(progs_ldadd) -lm
+strtoll_test_LDADD = $(progs_ldadd) -lm
 thread_test_LDADD = $(thread_ldadd)
 threadpool_test_LDADD = $(thread_ldadd)
 tree_test_LDADD = $(progs_ldadd)
@@ -175,6 +190,7 @@ unicode_collate_LDADD = $(progs_ldadd)
 utf8_validate_LDADD = $(progs_ldadd)
 utf8_pointer_LDADD = $(progs_ldadd)
 uri_test_LDADD = $(progs_ldadd)
+regex_test_LDADD = $(progs_ldadd)
 
 lib_LTLIBRARIES = libmoduletestplugin_a.la libmoduletestplugin_b.la
 
@@ -201,6 +217,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 \