From e88e4d5fb5343e93dd98e3955a0b870dbd4cd1e9 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Mon, 29 Sep 2008 19:20:16 +0000 Subject: [PATCH] * fix warning in tests * add config.h when needed * remove result/ dir before launching benchmark SVN revision: 36321 --- legacy/eina/Makefile.am | 3 ++- legacy/eina/src/tests/eina_test_array.c | 4 ++++ legacy/eina/src/tests/eina_test_benchmark.c | 8 ++++++-- legacy/eina/src/tests/eina_test_convert.c | 4 ++++ legacy/eina/src/tests/eina_test_counter.c | 4 ++++ legacy/eina/src/tests/eina_test_error.c | 5 +++++ legacy/eina/src/tests/eina_test_file.c | 7 +++++++ legacy/eina/src/tests/eina_test_hash.c | 3 ++- legacy/eina/src/tests/eina_test_inlist.c | 4 ++++ legacy/eina/src/tests/eina_test_lalloc.c | 6 +++++- legacy/eina/src/tests/eina_test_list.c | 4 ++++ legacy/eina/src/tests/eina_test_magic.c | 5 +++++ legacy/eina/src/tests/eina_test_main.c | 7 ++++++- legacy/eina/src/tests/eina_test_rbtree.c | 2 +- legacy/eina/src/tests/eina_test_stringshare.c | 7 ++++++- 15 files changed, 65 insertions(+), 8 deletions(-) diff --git a/legacy/eina/Makefile.am b/legacy/eina/Makefile.am index 8ab685bdce..585c306687 100644 --- a/legacy/eina/Makefile.am +++ b/legacy/eina/Makefile.am @@ -63,7 +63,7 @@ lcov-reset: lcov-report: @mkdir coverage - @lcov --compat-libtool --directory src --capture --output-file coverage/coverage.info + @lcov --compat-libtool --directory $(top_srcdir)/src --capture --output-file coverage/coverage.info @lcov -l coverage/coverage.info | grep -v "`cd $(top_srcdir) && pwd`" | cut -d: -f1 > coverage/remove @lcov -r coverage/coverage.info `cat coverage/remove` > coverage/coverage.cleaned.info @rm coverage/remove @@ -88,6 +88,7 @@ endif if EFL_ENABLE_BENCHMARK benchmark: + @rm -rf result @make -C src benchmark @mkdir result || true @cd result && ../src/tests/eina_bench `date +%F_%s` diff --git a/legacy/eina/src/tests/eina_test_array.c b/legacy/eina/src/tests/eina_test_array.c index 4443d62905..c8cd8bd48a 100644 --- a/legacy/eina/src/tests/eina_test_array.c +++ b/legacy/eina/src/tests/eina_test_array.c @@ -16,6 +16,10 @@ * if not, see . */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include "eina_suite.h" diff --git a/legacy/eina/src/tests/eina_test_benchmark.c b/legacy/eina/src/tests/eina_test_benchmark.c index 1db9e9fc4d..27b21eca91 100644 --- a/legacy/eina/src/tests/eina_test_benchmark.c +++ b/legacy/eina/src/tests/eina_test_benchmark.c @@ -16,11 +16,15 @@ * if not, see . */ -#include "eina_suite.h" -#include "eina_benchmark.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include +#include "eina_suite.h" +#include "eina_benchmark.h" + static int global_test = 0; static void diff --git a/legacy/eina/src/tests/eina_test_convert.c b/legacy/eina/src/tests/eina_test_convert.c index 7343d8864b..842aeea734 100644 --- a/legacy/eina/src/tests/eina_test_convert.c +++ b/legacy/eina/src/tests/eina_test_convert.c @@ -16,6 +16,10 @@ * if not, see . */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include diff --git a/legacy/eina/src/tests/eina_test_counter.c b/legacy/eina/src/tests/eina_test_counter.c index 7f062d5378..1edeb39985 100644 --- a/legacy/eina/src/tests/eina_test_counter.c +++ b/legacy/eina/src/tests/eina_test_counter.c @@ -16,6 +16,10 @@ * if not, see . */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include "eina_counter.h" diff --git a/legacy/eina/src/tests/eina_test_error.c b/legacy/eina/src/tests/eina_test_error.c index 9d4f92e5ae..233edfc000 100644 --- a/legacy/eina/src/tests/eina_test_error.c +++ b/legacy/eina/src/tests/eina_test_error.c @@ -16,8 +16,13 @@ * if not, see . */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include +#include #include "eina_suite.h" #include "eina_error.h" diff --git a/legacy/eina/src/tests/eina_test_file.c b/legacy/eina/src/tests/eina_test_file.c index 4323cfebb0..72f61b170a 100644 --- a/legacy/eina/src/tests/eina_test_file.c +++ b/legacy/eina/src/tests/eina_test_file.c @@ -16,6 +16,13 @@ * if not, see . */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include +#include + #include "eina_suite.h" #include "eina_file.h" diff --git a/legacy/eina/src/tests/eina_test_hash.c b/legacy/eina/src/tests/eina_test_hash.c index ca4d3bebf9..b75137c86a 100644 --- a/legacy/eina/src/tests/eina_test_hash.c +++ b/legacy/eina/src/tests/eina_test_hash.c @@ -20,8 +20,9 @@ # include "config.h" #endif -#include #include +#include +#include #include "eina_hash.h" #include "eina_convert.h" diff --git a/legacy/eina/src/tests/eina_test_inlist.c b/legacy/eina/src/tests/eina_test_inlist.c index 672b3280f4..62f8a2a4cd 100644 --- a/legacy/eina/src/tests/eina_test_inlist.c +++ b/legacy/eina/src/tests/eina_test_inlist.c @@ -16,6 +16,10 @@ * if not, see . */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include "eina_suite.h" diff --git a/legacy/eina/src/tests/eina_test_lalloc.c b/legacy/eina/src/tests/eina_test_lalloc.c index 6da11fb123..0b6ba6a3d7 100644 --- a/legacy/eina/src/tests/eina_test_lalloc.c +++ b/legacy/eina/src/tests/eina_test_lalloc.c @@ -16,8 +16,12 @@ * if not, see . */ -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include +#include #include "eina_suite.h" #include "eina_lalloc.h" diff --git a/legacy/eina/src/tests/eina_test_list.c b/legacy/eina/src/tests/eina_test_list.c index 095f527193..341183e273 100644 --- a/legacy/eina/src/tests/eina_test_list.c +++ b/legacy/eina/src/tests/eina_test_list.c @@ -16,6 +16,10 @@ * if not, see . */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include "eina_list.h" diff --git a/legacy/eina/src/tests/eina_test_magic.c b/legacy/eina/src/tests/eina_test_magic.c index a4d2298ce4..34551b7da0 100644 --- a/legacy/eina/src/tests/eina_test_magic.c +++ b/legacy/eina/src/tests/eina_test_magic.c @@ -16,7 +16,12 @@ * if not, see . */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include +#include #define EINA_MAGIC_DEBUG diff --git a/legacy/eina/src/tests/eina_test_main.c b/legacy/eina/src/tests/eina_test_main.c index e245511f95..d286138be9 100644 --- a/legacy/eina/src/tests/eina_test_main.c +++ b/legacy/eina/src/tests/eina_test_main.c @@ -16,10 +16,15 @@ * if not, see . */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + #include "Eina.h" #include "eina_suite.h" -#include START_TEST(eina_simple) { /* Eina_error as already been initialized by eina_hash diff --git a/legacy/eina/src/tests/eina_test_rbtree.c b/legacy/eina/src/tests/eina_test_rbtree.c index b0ee708429..cfb6e83b30 100644 --- a/legacy/eina/src/tests/eina_test_rbtree.c +++ b/legacy/eina/src/tests/eina_test_rbtree.c @@ -21,8 +21,8 @@ #endif #include -#include #include +#include #include "eina_array.h" #include "eina_suite.h" diff --git a/legacy/eina/src/tests/eina_test_stringshare.c b/legacy/eina/src/tests/eina_test_stringshare.c index a5b019ea28..83f5c49b4c 100644 --- a/legacy/eina/src/tests/eina_test_stringshare.c +++ b/legacy/eina/src/tests/eina_test_stringshare.c @@ -16,9 +16,14 @@ * if not, see . */ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include -#include #include +#include +#include #include "eina_suite.h" #include "eina_stringshare.h"