aboutsummaryrefslogtreecommitdiffstats
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
parentefl: update gitignore (diff)
downloadefl-1d295abac0340e18fa20aa2abc67be76cdc0b8d3.tar.gz
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
-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 5e6f07ea65..5006a1613a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@ Makefile.in
/libtool
/ltmain.sh
/compile
+/test-driver
/m4/libtool.m4
/m4/ltoptions.m4
/m4/ltsugar.m4
@@ -262,6 +263,10 @@ Makefile.in
/src/examples/evas/evas_smart_object
/src/examples/evas/evas_stacking
/src/examples/evas/evas_text
+/src/tests/ecore/ecore_suite.log
+/src/tests/ecore/ecore_suite.trs
+/src/tests/eet/eet_suite.log
+/src/tests/eet/eet_suite.trs
/src/tests/efreet/compare/efreet_alloc
/src/tests/efreet/compare/efreet_menu_alloc
/src/tests/efreet/efreet_cache_test
@@ -271,6 +276,7 @@ Makefile.in
/src/tests/efreet/efreet_user_dir
/src/tests/emotion/emotion_test
/src/tests/ecore/ecore_suite
+/src/tests/edbus/edbus_suite
/src/tests/edje/edje_suite
/src/tests/eet/eet_suite
/src/tests/eeze/eeze_suite
@@ -278,6 +284,8 @@ Makefile.in
/src/tests/eina/cxx_compile_test
/src/tests/eina/eina_suite
/src/tests/eo/eo_suite
+/src/tests/eo/eo_suite.log
+/src/tests/eo/eo_suite.trs
/src/tests/eo/test_access
/src/tests/eo/test_composite_objects
/src/tests/eo/test_constructors
@@ -286,3 +294,6 @@ Makefile.in
/src/tests/eo/test_mixin
/src/tests/eo/test_signals
/src/tests/evas/evas_suite
+/src/tests/evas/evas_suite.log
+/src/tests/evas/evas_suite.trs
+/src/test-suite.log
diff --git a/Makefile.am b/Makefile.am
index 712de985ea..25b72996e2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -255,19 +255,14 @@ endif
if EFL_ENABLE_TESTS
-check-local:
+lcov-check:
if EFL_ENABLE_COVERAGE
@$(MAKE) $(AM_MAKEFLAGS) lcov-reset
endif
-# @./src/tests/eina/eina_suite$(EXEEXT)
- @./src/tests/eet/eet_suite$(EXEEXT)
- @./src/tests/eo/eo_suite$(EXEEXT)
- @./src/tests/evas/evas_suite$(EXEEXT)
- @./src/tests/ecore/ecore_suite$(EXEEXT)
+ @$(MAKE) $(AM_MAKEFLAGS) check
if EFL_ENABLE_COVERAGE
@$(MAKE) $(AM_MAKEFLAGS) lcov-report
endif
-
endif
# benchmark
diff --git a/configure.ac b/configure.ac
index 1a8ae6c82f..47823150ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AH_BOTTOM([
AC_USE_SYSTEM_EXTENSIONS
-AM_INIT_AUTOMAKE([1.6 dist-bzip2 -Wall])
+AM_INIT_AUTOMAKE([1.6 dist-bzip2 -Wall color-tests])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
m4_ifdef([v_rev], , [m4_define([v_rev], [0])])
diff --git a/src/Makefile.am b/src/Makefile.am
index 865cad96ad..8600eaca56 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,6 +11,7 @@ bin_PROGRAMS =
bin_SCRIPTS =
noinst_PROGRAMS =
check_PROGRAMS =
+TESTS =
EXTRA_DIST =
include Makefile_Evil.am
diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am
index 97bb235519..e901c7f205 100644
--- a/src/Makefile_Ecore.am
+++ b/src/Makefile_Ecore.am
@@ -58,6 +58,7 @@ lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
if EFL_ENABLE_TESTS
check_PROGRAMS += tests/ecore/ecore_suite
+TESTS += tests/ecore/ecore_suite
tests_ecore_ecore_suite_SOURCES = \
tests/ecore/ecore_suite.c \
diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am
index 63142dc366..7646f0f880 100644
--- a/src/Makefile_Eet.am
+++ b/src/Makefile_Eet.am
@@ -54,6 +54,7 @@ bin_eet_eet_DEPENDENCIES = @USE_EET_INTERNAL_LIBS@
if EFL_ENABLE_TESTS
check_PROGRAMS += tests/eet/eet_suite
+TESTS += tests/eet/eet_suite
tests_eet_eet_suite_SOURCES = \
tests/eet/eet_suite.c \
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 80af55f93f..08899d3150 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -220,6 +220,7 @@ bin_SCRIPTS += scripts/eina/eina-bench-cmp
if EFL_ENABLE_TESTS
check_PROGRAMS += tests/eina/eina_suite tests/eina/cxx_compile_test
+#TESTS += tests/eina/eina_suite
tests_eina_eina_suite_SOURCES = \
tests/eina/eina_suite.c \
diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am
index f2dd3c4eb1..4c055d4c5a 100644
--- a/src/Makefile_Eo.am
+++ b/src/Makefile_Eo.am
@@ -29,6 +29,7 @@ tests/eo/test_signals
if EFL_ENABLE_TESTS
check_PROGRAMS += tests/eo/eo_suite
+TESTS += tests/eo/eo_suite
endif
tests_eo_test_access_SOURCES = \
diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am
index 82f792f611..6accb398f1 100644
--- a/src/Makefile_Evas.am
+++ b/src/Makefile_Evas.am
@@ -1546,6 +1546,7 @@ endif
if EFL_ENABLE_TESTS
check_PROGRAMS += tests/evas/evas_suite
+TESTS += tests/evas/evas_suite
tests_evas_evas_suite_SOURCES = \
tests/evas/evas_suite.c \