summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-09-16 14:25:29 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-09-16 14:25:29 +0000
commitc83143c8896752e139c82259e22c56715c313e7b (patch)
treea99aba40d0b91d19a46b15c1090cd8b399e347f9 /src
parent528a9831c82be6c1275ee8172c2ed5c1191ea23d (diff)
merge: mostly fix tests and benchmark
need to fix the city stuff in tests and the benchmark with the e17 data (need help with make rules :) SVN revision: 76712
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am12
-rw-r--r--src/benchmarks/Makefile.am11
-rw-r--r--src/benchmarks/eina/Makefile.am53
-rw-r--r--src/tests/Makefile.am3
-rw-r--r--src/tests/eina/Makefile.am167
5 files changed, 128 insertions, 118 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index d53263a5cb..24ceadb561 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,13 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = lib include modules bin scripts 3SUBDIRS = lib include modules bin scripts benchmarks tests
4
5.PHONY: benchmark benchmark-e17
6
7benchmark:
8 @make -C lib
9 @$(MAKE) -C benchmarks benchmark
10
11benchmark-e17:
12 @make -C lib
13 @$(MAKE) -C benchmarks benchmark-e17
diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am
new file mode 100644
index 0000000000..1bf18c0e94
--- /dev/null
+++ b/src/benchmarks/Makefile.am
@@ -0,0 +1,11 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3SUBDIRS = eina
4
5.PHONY: benchmark benchmark-e17
6
7benchmark:
8 @$(MAKE) -C eina benchmark
9
10benchmark-e17:
11 @$(MAKE) -C eina benchmark-e17
diff --git a/src/benchmarks/eina/Makefile.am b/src/benchmarks/eina/Makefile.am
new file mode 100644
index 0000000000..248ddfeda6
--- /dev/null
+++ b/src/benchmarks/eina/Makefile.am
@@ -0,0 +1,53 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3AM_CPPFLAGS = \
4-I$(top_srcdir)/src/include/eina \
5-I$(top_builddir)/src/include/eina \
6-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
7-DCITYHASH_BENCH \
8@EINA_CFLAGS@ \
9@GLIB_CFLAGS@
10
11EXTRA_PROGRAMS = eina_bench
12
13benchmark: eina_bench libcity.la
14
15#benchmark-e17: eina_bench
16# AM_CPPFLAGS += -DEINA_ENABLE_BENCH_E17
17
18eina_bench_SOURCES = \
19eina_bench.c \
20eina_bench_sort.c \
21eina_bench_hash.c \
22eina_bench_stringshare.c \
23eina_bench_convert.c \
24eina_bench_mempool.c \
25eina_bench_stringshare_e17.c \
26eina_bench_array.c \
27eina_bench_rectangle_pool.c \
28ecore_list.c \
29ecore_strings.c \
30ecore_hash.c \
31ecore_sheap.c \
32evas_hash.c \
33evas_list.c \
34evas_mempool.c \
35evas_object_list.c \
36evas_stringshare.c \
37eina_bench_quad.c \
38eina_bench.h \
39eina_suite.h \
40Ecore_Data.h \
41Evas_Data.h \
42evas_mempool.h
43
44EXTRA_LTLIBRARIES = libcity.la
45libcity_la_SOURCES = city.cc
46
47nodist_EXTRA_eina_bench_SOURCES = dummy.cc
48eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/eina/libeina.la libcity.la @EINA_LIBS@
49
50EXTRA_DIST = strlog
51
52clean-local:
53 rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
new file mode 100644
index 0000000000..b8f642fb72
--- /dev/null
+++ b/src/tests/Makefile.am
@@ -0,0 +1,3 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3SUBDIRS = eina
diff --git a/src/tests/eina/Makefile.am b/src/tests/eina/Makefile.am
index f6810e22c7..c87862214a 100644
--- a/src/tests/eina/Makefile.am
+++ b/src/tests/eina/Makefile.am
@@ -1,142 +1,75 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3benchdir = $(bindir) 3AM_CPPFLAGS = \
4 4-I$(top_srcdir)/src/include/eina \
5AM_CPPFLAGS = \ 5-I$(top_builddir)/src/include/eina \
6-I$(top_srcdir)/src/lib \ 6-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
7-I$(top_srcdir)/src/include \ 7@CHECK_CFLAGS@ \
8-I$(top_builddir)/src/include \ 8@EINA_CFLAGS@
9-I$(top_builddir)/src/lib \
10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
13-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
14@CHECK_CFLAGS@ \
15@EINA_CFLAGS@ \
16@GLIB_CFLAGS@
17
18if EINA_HAVE_GLIB
19
20AM_CPPFLAGS += -DEINA_BENCH_HAVE_GLIB
21
22endif
23
24if EINA_ENABLE_BENCHMARK_E17
25
26AM_CPPFLAGS += -DEINA_ENABLE_BENCH_E17
27
28endif
29 9
30if EFL_ENABLE_TESTS 10if EFL_ENABLE_TESTS
31 11
32check_PROGRAMS = eina_suite cxx_compile_test 12check_PROGRAMS = eina_suite cxx_compile_test
33 13
34eina_suite_SOURCES = \ 14eina_suite_SOURCES = \
35eina_suite.c \ 15eina_suite.c \
36eina_test_fp.c \ 16eina_test_fp.c \
37eina_test_stringshare.c \ 17eina_test_stringshare.c \
38eina_test_ustringshare.c\ 18eina_test_ustringshare.c \
39eina_test_ustr.c \ 19eina_test_ustr.c \
40eina_test_binshare.c \ 20eina_test_binshare.c \
41eina_test_binbuf.c \ 21eina_test_binbuf.c \
42eina_test_inarray.c \ 22eina_test_inarray.c \
43eina_test_array.c \ 23eina_test_array.c \
44eina_test_clist.c \ 24eina_test_clist.c \
45eina_test_error.c \ 25eina_test_error.c \
46eina_test_sched.c \ 26eina_test_sched.c \
47eina_test_log.c \ 27eina_test_log.c \
48eina_test_magic.c \ 28eina_test_magic.c \
49eina_test_inlist.c \ 29eina_test_inlist.c \
50eina_test_main.c \ 30eina_test_main.c \
51eina_test_counter.c \ 31eina_test_counter.c \
52eina_test_lalloc.c \ 32eina_test_lalloc.c \
53eina_test_hash.c \ 33eina_test_hash.c \
54eina_test_iterator.c \ 34eina_test_iterator.c \
55eina_test_accessor.c \ 35eina_test_accessor.c \
56eina_test_module.c \ 36eina_test_module.c \
57eina_test_convert.c \ 37eina_test_convert.c \
58eina_test_rbtree.c \ 38eina_test_rbtree.c \
59eina_test_file.c \ 39eina_test_file.c \
60eina_test_benchmark.c \ 40eina_test_benchmark.c \
61eina_test_mempool.c \ 41eina_test_mempool.c \
62eina_test_rectangle.c \ 42eina_test_rectangle.c \
63eina_test_list.c \ 43eina_test_list.c \
64eina_test_matrixsparse.c \ 44eina_test_matrixsparse.c \
65eina_test_tiler.c \ 45eina_test_tiler.c \
66eina_test_strbuf.c \ 46eina_test_strbuf.c \
67eina_test_str.c \ 47eina_test_str.c \
68eina_test_quadtree.c \ 48eina_test_quadtree.c \
69eina_test_simple_xml_parser.c \ 49eina_test_simple_xml_parser.c \
70eina_test_value.c 50eina_test_value.c
71# eina_test_model.c 51# eina_test_model.c
72 52
73eina_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ -lm 53eina_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@ -lm
74 54
75cxx_compile_test_SOURCES = cxx_compile_test.cxx 55cxx_compile_test_SOURCES = cxx_compile_test.cxx
76cxx_compile_test_LDADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ 56cxx_compile_test_LDADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
57
58EXTRA_LTLIBRARIES = module_dummy.la
77 59
78module_dummydir = $(libdir)/eina/test 60check-local: module_dummy.la
79module_dummy_LTLIBRARIES = module_dummy.la
80 61
81module_dummy_la_SOURCES = \ 62module_dummy_la_SOURCES = eina_test_module_dummy.c
82eina_test_module_dummy.c
83 63
84module_dummy_la_CPPFLAGS = \ 64module_dummy_la_CPPFLAGS = \
85-I$(top_srcdir)/src/lib \ 65-I$(top_srcdir)/src/include/eina \
86-I$(top_srcdir)/src/include \ 66-I$(top_builddir)/src/include/eina \
87-I$(top_builddir)/src/include \
88-I$(top_builddir)/src/lib \
89@EFL_EINA_BUILD@ 67@EFL_EINA_BUILD@
90module_dummy_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ -lm 68module_dummy_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@ -lm
91module_dummy_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 69module_dummy_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
92module_dummy_la_LIBTOOLFLAGS = --tag=disable-static 70module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
93 71
94endif 72endif
95 73
96if EFL_ENABLE_BENCHMARK
97
98bench_PROGRAMS = eina_bench
99
100eina_bench_SOURCES = \
101eina_bench.c \
102eina_bench_sort.c \
103eina_bench_hash.c \
104eina_bench_stringshare.c \
105eina_bench_convert.c \
106eina_bench_mempool.c \
107eina_bench_stringshare_e17.c \
108eina_bench_array.c \
109eina_bench_rectangle_pool.c \
110ecore_list.c \
111ecore_strings.c \
112ecore_hash.c \
113ecore_sheap.c \
114evas_hash.c \
115evas_list.c \
116evas_mempool.c \
117evas_object_list.c \
118evas_stringshare.c \
119eina_bench_quad.c \
120eina_bench.h \
121eina_suite.h \
122Ecore_Data.h \
123Evas_Data.h \
124evas_mempool.h
125
126if CITYHASH_BENCH
127noinst_LTLIBRARIES = libcity.la
128libcity_la_SOURCES = city.cc
129
130nodist_EXTRA_eina_bench_SOURCES = dummy.cc
131eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/libeina.la libcity.la @EINA_LIBS@
132else
133eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/libeina.la @EINA_LIBS@
134
135endif
136
137endif
138
139EXTRA_DIST = strlog
140
141clean-local: 74clean-local:
142 rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda 75 rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda