summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2013-01-15 20:51:04 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2013-01-15 20:51:04 +0000
commit1d295abac0340e18fa20aa2abc67be76cdc0b8d3 (patch)
treea16e9ef9a2c47863d598b55877bf03dfab19b91a
parent40148ef2c551e7a74f26b90393ef8199eb833259 (diff)
efl: use autotools testsuite for running tests
Instead of just making our own "check-local" and calling the binaries ourselves, just append them into "TESTS" variable. Then they run after all check_PROGRAMS are compiled. The reasons for changing are: 1) If we change the test and call "make check" the test is not compiled again -- and the only way to compile it is to "make clean". 2) There's no need to reinvent the wheel here. With a recent version of Automake, the test output is redirected to log files. This is good but unexpected for whom was used to the previous way. So, be warned. SVN revision: 82841
Diffstat (limited to '')
-rw-r--r--.gitignore11
-rw-r--r--Makefile.am9
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am1
-rw-r--r--src/Makefile_Ecore.am1
-rw-r--r--src/Makefile_Eet.am1
-rw-r--r--src/Makefile_Eina.am1
-rw-r--r--src/Makefile_Eo.am1
-rw-r--r--src/Makefile_Evas.am1
9 files changed, 20 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 5e6f07e..5006a16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ Makefile.in
31/libtool 31/libtool
32/ltmain.sh 32/ltmain.sh
33/compile 33/compile
34/test-driver
34/m4/libtool.m4 35/m4/libtool.m4
35/m4/ltoptions.m4 36/m4/ltoptions.m4
36/m4/ltsugar.m4 37/m4/ltsugar.m4
@@ -262,6 +263,10 @@ Makefile.in
262/src/examples/evas/evas_smart_object 263/src/examples/evas/evas_smart_object
263/src/examples/evas/evas_stacking 264/src/examples/evas/evas_stacking
264/src/examples/evas/evas_text 265/src/examples/evas/evas_text
266/src/tests/ecore/ecore_suite.log
267/src/tests/ecore/ecore_suite.trs
268/src/tests/eet/eet_suite.log
269/src/tests/eet/eet_suite.trs
265/src/tests/efreet/compare/efreet_alloc 270/src/tests/efreet/compare/efreet_alloc
266/src/tests/efreet/compare/efreet_menu_alloc 271/src/tests/efreet/compare/efreet_menu_alloc
267/src/tests/efreet/efreet_cache_test 272/src/tests/efreet/efreet_cache_test
@@ -271,6 +276,7 @@ Makefile.in
271/src/tests/efreet/efreet_user_dir 276/src/tests/efreet/efreet_user_dir
272/src/tests/emotion/emotion_test 277/src/tests/emotion/emotion_test
273/src/tests/ecore/ecore_suite 278/src/tests/ecore/ecore_suite
279/src/tests/edbus/edbus_suite
274/src/tests/edje/edje_suite 280/src/tests/edje/edje_suite
275/src/tests/eet/eet_suite 281/src/tests/eet/eet_suite
276/src/tests/eeze/eeze_suite 282/src/tests/eeze/eeze_suite
@@ -278,6 +284,8 @@ Makefile.in
278/src/tests/eina/cxx_compile_test 284/src/tests/eina/cxx_compile_test
279/src/tests/eina/eina_suite 285/src/tests/eina/eina_suite
280/src/tests/eo/eo_suite 286/src/tests/eo/eo_suite
287/src/tests/eo/eo_suite.log
288/src/tests/eo/eo_suite.trs
281/src/tests/eo/test_access 289/src/tests/eo/test_access
282/src/tests/eo/test_composite_objects 290/src/tests/eo/test_composite_objects
283/src/tests/eo/test_constructors 291/src/tests/eo/test_constructors
@@ -286,3 +294,6 @@ Makefile.in
286/src/tests/eo/test_mixin 294/src/tests/eo/test_mixin
287/src/tests/eo/test_signals 295/src/tests/eo/test_signals
288/src/tests/evas/evas_suite 296/src/tests/evas/evas_suite
297/src/tests/evas/evas_suite.log
298/src/tests/evas/evas_suite.trs
299/src/test-suite.log
diff --git a/Makefile.am b/Makefile.am
index 712de98..25b7299 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -255,19 +255,14 @@ endif
255 255
256if EFL_ENABLE_TESTS 256if EFL_ENABLE_TESTS
257 257
258check-local: 258lcov-check:
259if EFL_ENABLE_COVERAGE 259if EFL_ENABLE_COVERAGE
260 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset 260 @$(MAKE) $(AM_MAKEFLAGS) lcov-reset
261endif 261endif
262# @./src/tests/eina/eina_suite$(EXEEXT) 262 @$(MAKE) $(AM_MAKEFLAGS) check
263 @./src/tests/eet/eet_suite$(EXEEXT)
264 @./src/tests/eo/eo_suite$(EXEEXT)
265 @./src/tests/evas/evas_suite$(EXEEXT)
266 @./src/tests/ecore/ecore_suite$(EXEEXT)
267if EFL_ENABLE_COVERAGE 263if EFL_ENABLE_COVERAGE
268 @$(MAKE) $(AM_MAKEFLAGS) lcov-report 264 @$(MAKE) $(AM_MAKEFLAGS) lcov-report
269endif 265endif
270
271endif 266endif
272 267
273# benchmark 268# benchmark
diff --git a/configure.ac b/configure.ac
index 1a8ae6c..4782315 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AH_BOTTOM([
37 37
38AC_USE_SYSTEM_EXTENSIONS 38AC_USE_SYSTEM_EXTENSIONS
39 39
40AM_INIT_AUTOMAKE([1.6 dist-bzip2 -Wall]) 40AM_INIT_AUTOMAKE([1.6 dist-bzip2 -Wall color-tests])
41m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 41m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
42 42
43m4_ifdef([v_rev], , [m4_define([v_rev], [0])]) 43m4_ifdef([v_rev], , [m4_define([v_rev], [0])])
diff --git a/src/Makefile.am b/src/Makefile.am
index 865cad9..8600eac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,7 @@ bin_PROGRAMS =
11bin_SCRIPTS = 11bin_SCRIPTS =
12noinst_PROGRAMS = 12noinst_PROGRAMS =
13check_PROGRAMS = 13check_PROGRAMS =
14TESTS =
14EXTRA_DIST = 15EXTRA_DIST =
15 16
16include Makefile_Evil.am 17include Makefile_Evil.am
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 97bb235..e901c7f 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -58,6 +58,7 @@ lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
58if EFL_ENABLE_TESTS 58if EFL_ENABLE_TESTS
59 59
60check_PROGRAMS += tests/ecore/ecore_suite 60check_PROGRAMS += tests/ecore/ecore_suite
61TESTS += tests/ecore/ecore_suite
61 62
62tests_ecore_ecore_suite_SOURCES = \ 63tests_ecore_ecore_suite_SOURCES = \
63tests/ecore/ecore_suite.c \ 64tests/ecore/ecore_suite.c \
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 63142dc..7646f0f 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -54,6 +54,7 @@ bin_eet_eet_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
54if EFL_ENABLE_TESTS 54if EFL_ENABLE_TESTS
55 55
56check_PROGRAMS += tests/eet/eet_suite 56check_PROGRAMS += tests/eet/eet_suite
57TESTS += tests/eet/eet_suite
57 58
58tests_eet_eet_suite_SOURCES = \ 59tests_eet_eet_suite_SOURCES = \
59tests/eet/eet_suite.c \ 60tests/eet/eet_suite.c \
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 80af55f..08899d3 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -220,6 +220,7 @@ bin_SCRIPTS += scripts/eina/eina-bench-cmp
220if EFL_ENABLE_TESTS 220if EFL_ENABLE_TESTS
221 221
222check_PROGRAMS += tests/eina/eina_suite tests/eina/cxx_compile_test 222check_PROGRAMS += tests/eina/eina_suite tests/eina/cxx_compile_test
223#TESTS += tests/eina/eina_suite
223 224
224tests_eina_eina_suite_SOURCES = \ 225tests_eina_eina_suite_SOURCES = \
225tests/eina/eina_suite.c \ 226tests/eina/eina_suite.c \
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index f2dd3c4..4c055d4 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -29,6 +29,7 @@ tests/eo/test_signals
29 29
30if EFL_ENABLE_TESTS 30if EFL_ENABLE_TESTS
31check_PROGRAMS += tests/eo/eo_suite 31check_PROGRAMS += tests/eo/eo_suite
32TESTS += tests/eo/eo_suite
32endif 33endif
33 34
34tests_eo_test_access_SOURCES = \ 35tests_eo_test_access_SOURCES = \
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 82f792f..6accb39 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1546,6 +1546,7 @@ endif
1546if EFL_ENABLE_TESTS 1546if EFL_ENABLE_TESTS
1547 1547
1548check_PROGRAMS += tests/evas/evas_suite 1548check_PROGRAMS += tests/evas/evas_suite
1549TESTS += tests/evas/evas_suite
1549 1550
1550tests_evas_evas_suite_SOURCES = \ 1551tests_evas_evas_suite_SOURCES = \
1551tests/evas/evas_suite.c \ 1552tests/evas/evas_suite.c \