aboutsummaryrefslogtreecommitdiffstats
path: root/src/tests
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/tests
parent528a9831c82be6c1275ee8172c2ed5c1191ea23d (diff)
downloadefl-c83143c8896752e139c82259e22c56715c313e7b.tar.gz
efl-c83143c8896752e139c82259e22c56715c313e7b.tar.xz
efl-c83143c8896752e139c82259e22c56715c313e7b.zip
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/tests')
-rw-r--r--src/tests/Makefile.am3
-rw-r--r--src/tests/eina/Makefile.am167
2 files changed, 53 insertions, 117 deletions
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
new file mode 100644
index 000000000..b8f642fb7
--- /dev/null
+++ b/src/tests/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = eina
diff --git a/src/tests/eina/Makefile.am b/src/tests/eina/Makefile.am
index f6810e22c..c87862214 100644
--- a/src/tests/eina/Makefile.am
+++ b/src/tests/eina/Makefile.am
@@ -1,142 +1,75 @@
MAINTAINERCLEANFILES = Makefile.in
-benchdir = $(bindir)
-
-AM_CPPFLAGS = \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/include \
--I$(top_builddir)/src/include \
--I$(top_builddir)/src/lib \
--DPACKAGE_BIN_DIR=\"$(bindir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
--DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-@CHECK_CFLAGS@ \
-@EINA_CFLAGS@ \
-@GLIB_CFLAGS@
-
-if EINA_HAVE_GLIB
-
-AM_CPPFLAGS += -DEINA_BENCH_HAVE_GLIB
-
-endif
-
-if EINA_ENABLE_BENCHMARK_E17
-
-AM_CPPFLAGS += -DEINA_ENABLE_BENCH_E17
-
-endif
+AM_CPPFLAGS = \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina \
+-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
+@CHECK_CFLAGS@ \
+@EINA_CFLAGS@
if EFL_ENABLE_TESTS
check_PROGRAMS = eina_suite cxx_compile_test
-eina_suite_SOURCES = \
-eina_suite.c \
-eina_test_fp.c \
+eina_suite_SOURCES = \
+eina_suite.c \
+eina_test_fp.c \
eina_test_stringshare.c \
-eina_test_ustringshare.c\
-eina_test_ustr.c \
-eina_test_binshare.c \
-eina_test_binbuf.c \
-eina_test_inarray.c \
-eina_test_array.c \
-eina_test_clist.c \
-eina_test_error.c \
-eina_test_sched.c \
-eina_test_log.c \
-eina_test_magic.c \
-eina_test_inlist.c \
-eina_test_main.c \
-eina_test_counter.c \
-eina_test_lalloc.c \
-eina_test_hash.c \
-eina_test_iterator.c \
-eina_test_accessor.c \
-eina_test_module.c \
-eina_test_convert.c \
-eina_test_rbtree.c \
-eina_test_file.c \
-eina_test_benchmark.c \
-eina_test_mempool.c \
-eina_test_rectangle.c \
-eina_test_list.c \
+eina_test_ustringshare.c \
+eina_test_ustr.c \
+eina_test_binshare.c \
+eina_test_binbuf.c \
+eina_test_inarray.c \
+eina_test_array.c \
+eina_test_clist.c \
+eina_test_error.c \
+eina_test_sched.c \
+eina_test_log.c \
+eina_test_magic.c \
+eina_test_inlist.c \
+eina_test_main.c \
+eina_test_counter.c \
+eina_test_lalloc.c \
+eina_test_hash.c \
+eina_test_iterator.c \
+eina_test_accessor.c \
+eina_test_module.c \
+eina_test_convert.c \
+eina_test_rbtree.c \
+eina_test_file.c \
+eina_test_benchmark.c \
+eina_test_mempool.c \
+eina_test_rectangle.c \
+eina_test_list.c \
eina_test_matrixsparse.c \
-eina_test_tiler.c \
-eina_test_strbuf.c \
-eina_test_str.c \
-eina_test_quadtree.c \
+eina_test_tiler.c \
+eina_test_strbuf.c \
+eina_test_str.c \
+eina_test_quadtree.c \
eina_test_simple_xml_parser.c \
eina_test_value.c
# eina_test_model.c
-eina_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ -lm
+eina_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@ -lm
cxx_compile_test_SOURCES = cxx_compile_test.cxx
-cxx_compile_test_LDADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@
+cxx_compile_test_LDADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@
+
+EXTRA_LTLIBRARIES = module_dummy.la
-module_dummydir = $(libdir)/eina/test
-module_dummy_LTLIBRARIES = module_dummy.la
+check-local: module_dummy.la
-module_dummy_la_SOURCES = \
-eina_test_module_dummy.c
+module_dummy_la_SOURCES = eina_test_module_dummy.c
-module_dummy_la_CPPFLAGS = \
--I$(top_srcdir)/src/lib \
--I$(top_srcdir)/src/include \
--I$(top_builddir)/src/include \
--I$(top_builddir)/src/lib \
+module_dummy_la_CPPFLAGS = \
+-I$(top_srcdir)/src/include/eina \
+-I$(top_builddir)/src/include/eina \
@EFL_EINA_BUILD@
-module_dummy_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ -lm
-module_dummy_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
+module_dummy_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@ -lm
+module_dummy_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
endif
-if EFL_ENABLE_BENCHMARK
-
-bench_PROGRAMS = eina_bench
-
-eina_bench_SOURCES = \
-eina_bench.c \
-eina_bench_sort.c \
-eina_bench_hash.c \
-eina_bench_stringshare.c \
-eina_bench_convert.c \
-eina_bench_mempool.c \
-eina_bench_stringshare_e17.c \
-eina_bench_array.c \
-eina_bench_rectangle_pool.c \
-ecore_list.c \
-ecore_strings.c \
-ecore_hash.c \
-ecore_sheap.c \
-evas_hash.c \
-evas_list.c \
-evas_mempool.c \
-evas_object_list.c \
-evas_stringshare.c \
-eina_bench_quad.c \
-eina_bench.h \
-eina_suite.h \
-Ecore_Data.h \
-Evas_Data.h \
-evas_mempool.h
-
-if CITYHASH_BENCH
-noinst_LTLIBRARIES = libcity.la
-libcity_la_SOURCES = city.cc
-
-nodist_EXTRA_eina_bench_SOURCES = dummy.cc
-eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/libeina.la libcity.la @EINA_LIBS@
-else
-eina_bench_LDADD = @GLIB_LIBS@ $(top_builddir)/src/lib/libeina.la @EINA_LIBS@
-
-endif
-
-endif
-
-EXTRA_DIST = strlog
-
clean-local:
rm -rf *.gcno ..\#..\#src\#*.gcov *.gcda