X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=tests%2Fgobject%2FMakefile.am;h=9cfb33ba3dc8d862898ad277026bc3dfffe29012;hb=3e30e8a87e18952e9c26c0d05f5c336a110f2bed;hp=778b535547c93a1d3e1744d6b04f3f25b5959e03;hpb=2ae1a46b4c8d9849f43eb9f059a98eadb4f2a6c9;p=platform%2Fupstream%2Fglib.git

diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index 778b535..9cfb33b 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/glib			\
@@ -9,6 +11,12 @@ libgthread = $(top_builddir)/gthread/libgthread-2.0.la
 libgmodule = $(top_builddir)/gmodule/libgmodule-2.0.la
 libgobject = $(top_builddir)/gobject/libgobject-2.0.la
 
+
+# libtool dependency tracking seems broken.  this is currently
+# required to get the tests to dynamic link against the in-tree
+# libglib instead of the system one
+libgobject += $(libglib)
+
 ########################################################################
 
 noinst_LTLIBRARIES = libtestgobject.la
@@ -43,27 +51,38 @@ CLEANFILES = stamp-testmarshal.h
 
 ########################################################################
 
-LDADD = libtestgobject.la $(libgobject) 
+LDADD = libtestgobject.la $(libgobject)
 
 test_programs =					\
+	deftype					\
+	gvalue-test				\
+	paramspec-test				\
 	accumulator				\
 	defaultiface				\
+	dynamictype				\
 	ifacecheck				\
 	ifaceinit				\
 	ifaceinherit				\
 	ifaceproperties				\
 	override				\
+	performance				\
+	performance-threaded			\
+	singleton				\
 	references
 
+performance_LDADD = $(libgobject) $(libgthread)
+performance_threaded_LDADD = $(libgobject) $(libgthread)
 check_PROGRAMS = $(test_programs)
 
 TESTS = $(test_programs)
 TESTS_ENVIRONMENT = srcdir=$(srcdir) \
-	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset
+	LIBCHARSET_ALIAS_DIR=$(top_builddir)/glib/libcharset \
+	MALLOC_CHECK_=2	\
+	MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256))
 
 ########################################################################
 
-EXTRA_DIST = 		  \
+EXTRA_DIST += 		  \
 	testmarshal.list
 
 BUILT_EXTRA_DIST =				\