changes: TINF-175 TZPC-4722

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

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 48e98c6..2a9abe3 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,27 +1,26 @@
 include $(top_srcdir)/Makefile.decl
 
-NULL =
-
-AM_CPPFLAGS = \
-       -I$(top_srcdir)/gee \
-       $(GLIB_CFLAGS) \
-       $(NULL)
-
 noinst_PROGRAMS = $(TEST_PROGS)
 
-progs_ldadd = $(GLIB_LIBS) ../gee/libgee.la
-
-BUILT_SOURCES = tests.vala.stamp
-
 TEST_PROGS += tests
-tests_VALASOURCES = \
+
+tests_SOURCES = \
        testarraylist.vala \
+       testarrayqueue.vala \
+       testbidirlist.vala \
+       testbidirsortedset.vala \
+       testbidirsortedmap.vala \
        testcase.vala \
        testcollection.vala \
+       testconcurrentlist.vala \
+       testconcurrentset.vala \
+       testdata.vala \
        testdeque.vala \
+       testfunctions.vala \
        testhashmap.vala \
        testhashmultimap.vala \
        testhashmultiset.vala \
+       testhashset.vala \
        testlinkedlist.vala \
        testlinkedlistasdeque.vala \
        testlist.vala \
@@ -31,17 +30,39 @@ tests_VALASOURCES = \
        testmultiset.vala \
        testpriorityqueue.vala \
        testqueue.vala \
+       testreadonlybidirlist.vala \
        testreadonlycollection.vala \
        testreadonlylist.vala \
+       testreadonlymap.vala \
+       testreadonlyset.vala \
+       testset.vala \
+       testsortedset.vala \
+       testsortedmap.vala \
        testtreemap.vala \
+       testtreemultimap.vala \
+       testtreemultiset.vala \
+       testtreeset.vala \
        $(NULL)
 
-tests_SOURCES = tests.vala.stamp $(tests_VALASOURCES:.vala=.c)
-tests.vala.stamp: $(tests_VALASOURCES)
-       $(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/gee --pkg gee-1.0 $^
-       touch $@
-tests_LDADD = $(progs_ldadd)
-EXTRA_DIST += $(tests_VALASOURCES)
+tests_DEPENDENCIES = \
+       $(top_srcdir)/gee/gee-0.8.vapi \
+       $(NULL)
+
+tests_VALAFLAGS = \
+       --basedir $(top_srcdir) \
+       --vapidir $(top_srcdir)/gee \
+       --pkg gee-0.8 --pkg posix \
+       $(VALAFLAGS) \
+       $(NULL)
+
+tests_CPPFLAGS = \
+       -I$(top_srcdir)/gee \
+       $(GLIB_CFLAGS) \
+       $(NULL)
+
+tests_LDADD = \
+       $(GLIB_LIBS) ../gee/libgee-0.8.la \
+       $(NULL)
 
 coverage-reset:
        lcov --base-directory=@top_srcdir@ --directory @top_srcdir@/gee --zerocounters
@@ -54,7 +75,7 @@ coverage-report:
        lcov --directory @top_srcdir@/gee \
                --output-file @top_builddir@/lcov.info \
                --remove @top_builddir@/lcov.info \
-               /usr/include/\*
+               "/usr/include/*" "*.c" "*.h" "*.vapi"
 
        $(mkdir_p) @top_builddir@/tests/coverage
        git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\
@@ -69,21 +90,3 @@ clean-local:
        -rm -rf coverage
 
 .PHONY: coverage-report
-
-TEST_PROGS += testhashset
-testhashset_VALASOURCES = testhashset.vala
-testhashset_SOURCES = testhashset.c
-$(testhashset_SOURCES): $(testhashset_VALASOURCES)
-       $(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/gee --pkg gee-1.0 $^
-       touch $@
-testhashset_LDADD = $(progs_ldadd)
-EXTRA_DIST += $(testhashset_VALASOURCES)
-
-TEST_PROGS += testtreeset
-testtreeset_VALASOURCES = testtreeset.vala
-testtreeset_SOURCES = testtreeset.c testtreeset.h
-$(testtreeset_SOURCES): $(testtreeset_VALASOURCES)
-       $(VALAC) -C --basedir $(top_srcdir) --vapidir $(top_srcdir)/gee --pkg gee-1.0 $^
-       touch $@
-testtreeset_LDADD = $(progs_ldadd)
-EXTRA_DIST += $(testtreeset_VALASOURCES)