Towards normalization

[profile/ivi/org.tizen.video-player.git] / test / Makefile.am

diff --git a/test/Makefile.am b/test/Makefile.am
index 4cbc590..bad1118 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -7,7 +7,7 @@ DISTCLEANFILES =
 MAINTAINERCLEANFILES =
 
 if HAVE_GLIB
-AM_CPPFLAGS = -I$(top_srcdir)/src/ $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
+AM_CPPFLAGS = -DSRCDIR="\"$(srcdir)\"" -I$(top_srcdir)/src/ $(GLIB_CFLAGS) $(GTHREAD_CFLAGS)
 LDADD = $(top_builddir)/src/libharfbuzz.la $(GLIB_LIBS) $(GTHREAD_LIBS)
 
 EXTRA_DIST += hb-test.h
@@ -47,7 +47,13 @@ test_c_CPPFLAGS += $(FREETYPE_CFLAGS)
 test_cplusplus_CPPFLAGS += $(FREETYPE_CFLAGS)
 # TODO replace freetype with other stuff in the following test
 test_object_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
-test_object_LIBS = $(LDADD) $(FREETYPE_LIBS)
+test_object_LDADD = $(LDADD) $(FREETYPE_LIBS)
+
+TEST_PROGS += \
+       test-shape-complex \
+       $(NULL)
+test_shape_complex_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
+test_shape_complex_LDADD = $(LDADD) $(FREETYPE_LIBS)
 endif
 
 
@@ -58,6 +64,7 @@ TESTS_ENVIRONMENT = \
        MALLOC_PERTURB_=$$(($${RANDOM:-256} % 256)) \
        G_DEBUG=gc-friendly \
        G_SLICE=always-malloc \
+       srcdir=$(srcdir) \
        $(ENV)
 
 
@@ -75,17 +82,17 @@ check-tool-raw:
 # check-gtester: Run tests under gtester
 GTESTER = gtester
 check-gtester:
-       $(AM_V_at)$(MAKE) $(AM_MAKEFLGS) check-tool-raw TOOL="$(GTESTER) --verbose"
+       $(AM_V_at)$(MAKE) $(AM_MAKEFLGS) check-tool-raw TOOL="$(GTESTER) --verbose --keep-going"
 
 
-# Check tests under valgrind.  Saves log to valgrind-log
+# Check tests under valgrind.  Saves log to log-valgrind.txt
 VALGRIND_FLAGS = \
        --tool=memcheck --suppressions=$(srcdir)/.valgrind-suppressions \
        --track-origins=yes \
        --leak-check=yes
        $(EXTRA_VALGRIND_FLAGS)
 #      Can't do for now: --show-reachable=yes
-CLEANFILES +=  valgrind-log
+CLEANFILES +=  log-valgrind.txt
 valgrind_verbose = $(valgrind_verbose_$(V))
 valgrind_verbose_ = $(valgrind_verbose_$(AM_DEFAULT_VERBOSITY))
 valgrind_verbose_0 = | \
@@ -93,7 +100,7 @@ valgrind_verbose_0 = | \
 # TODO: The following check does not fail if valgrind finds error.  It should.
 check-valgrind:
        $(AM_V_at)$(MAKE) $(AM_MAKEFLGS) check-tool TOOL="valgrind $(VALGRIND_FLAGS)" \
-       2>&1 | tee valgrind-log $(valgrind_verbose)
+       2>&1 | tee log-valgrind.txt $(valgrind_verbose)
 
 
 # check-symbols: Finds untested API symbols