From: Vincent T. <vt...@un...> - 2009-09-04 14:12:05
|
> +EFL_CHECK_COVERAGE([${enable_tests}], [enable_coverage="yes"], [enable_coverage="no"]) that macro needs ${enable_tests}, set by EFL_CHECK_TESTS (below), so move EFL_CHECK_TESTS before that call Vincent > EINA_CFLAGS="${EFL_COVERAGE_CFLAGS}" > case "${host_os}" in > cegcc*) > @@ -348,7 +349,6 @@ > ### Unit tests, coverage and benchmarking > > EFL_CHECK_TESTS([enable_tests="yes"], [enable_tests="no"]) > -EFL_CHECK_COVERAGE([${enable_tests}], [enable_coverage="yes"], [enable_coverage="no"]) > EFL_CHECK_BENCHMARK([enable_benchmark="yes"], [enable_benchmark="no"]) > EINA_BENCH_MODULE([evas], [${enable_benchmark}], [evas], [enable_benchmark_evas="yes"], [enable_benchmark_evas="no"]) > EINA_BENCH_MODULE([ecore], [${enable_benchmark}], [ecore], [enable_benchmark_ecore="yes"], [enable_benchmark_ecore="no"]) > > Modified: trunk/eina/src/include/Eina.h > =================================================================== > --- trunk/eina/src/include/Eina.h 2009-09-04 12:03:12 UTC (rev 42242) > +++ trunk/eina/src/include/Eina.h 2009-09-04 13:43:44 UTC (rev 42243) > @@ -181,6 +181,7 @@ > #include "eina_cpu.h" > #include "eina_tiler.h" > #include "eina_hamster.h" > +#include "eina_matrixsparse.h" > > #ifdef __cplusplus > } > > Added: trunk/eina/src/include/eina_matrixsparse.h > > Modified: trunk/eina/src/include/eina_private.h > =================================================================== > --- trunk/eina/src/include/eina_private.h 2009-09-04 12:03:12 UTC (rev 42242) > +++ trunk/eina/src/include/eina_private.h 2009-09-04 13:43:44 UTC (rev 42243) > @@ -71,6 +71,17 @@ > #define EINA_MAGIC_TILER 0x98761240 > #define EINA_MAGIC_TILER_ITERATOR 0x98761241 > > +#define EINA_MAGIC_MATRIXSPARSE 0x98761242 > +#define EINA_MAGIC_MATRIXSPARSE_ROW 0x98761243 > +#define EINA_MAGIC_MATRIXSPARSE_CELL 0x98761244 > +#define EINA_MAGIC_MATRIXSPARSE_ITERATOR 0x98761245 > +#define EINA_MAGIC_MATRIXSPARSE_ROW_ITERATOR 0x98761246 > +#define EINA_MAGIC_MATRIXSPARSE_ROW_ACCESSOR 0x98761247 > +#define EINA_MAGIC_MATRIXSPARSE_CELL_ITERATOR 0x98761248 > +#define EINA_MAGIC_MATRIXSPARSE_CELL_ACCESSOR 0x98761249 > + > + > + > /* undef the following, we want out version */ > #undef FREE > #define FREE(ptr) \ > > Modified: trunk/eina/src/lib/Makefile.am > =================================================================== > --- trunk/eina/src/lib/Makefile.am 2009-09-04 12:03:12 UTC (rev 42242) > +++ trunk/eina/src/lib/Makefile.am 2009-09-04 13:43:44 UTC (rev 42243) > @@ -19,6 +19,7 @@ > eina_file.c \ > eina_mempool.c \ > eina_list.c \ > +eina_matrixsparse.c \ > eina_module.c \ > eina_value.c \ > eina_array.c \ > > Modified: trunk/eina/src/lib/eina_main.c > =================================================================== > --- trunk/eina/src/lib/eina_main.c 2009-09-04 12:03:12 UTC (rev 42242) > +++ trunk/eina/src/lib/eina_main.c 2009-09-04 13:43:44 UTC (rev 42243) > @@ -31,6 +31,7 @@ > #include "eina_hash.h" > #include "eina_stringshare.h" > #include "eina_list.h" > +#include "eina_matrixsparse.h" > #include "eina_array.h" > #include "eina_counter.h" > #include "eina_benchmark.h" > @@ -89,6 +90,7 @@ > * @li eina_hash_init() > * @li eina_stringshare_init() > * @li eina_list_init() > + * @li eina_matrixsparse_init() > * @li eina_array_init() > * @li eina_counter_init() > * @li eina_benchmark_init() > @@ -144,6 +146,11 @@ > ERR("Could not initialize eina list module."); > goto list_init_error; > } > + if (!eina_matrixsparse_init()) > + { > + ERR("Could not initialize eina matrixsparse module."); > + goto matrixsparse_init_error; > + } > if (!eina_array_init()) > { > ERR("Could not initialize eina array module."); > @@ -182,6 +189,8 @@ > counter_init_error: > eina_array_shutdown(); > array_init_error: > + eina_matrixsparse_shutdown(); > + matrixsparse_init_error: > eina_list_shutdown(); > list_init_error: > eina_stringshare_shutdown(); > @@ -214,6 +223,7 @@ > * @li eina_benchmark_shutdown() > * @li eina_counter_shutdown() > * @li eina_array_shutdown() > + * @li eina_matrixsparse_shutdown() > * @li eina_list_shutdown() > * @li eina_stringshare_shutdown() > * @li eina_hash_shutdown() > @@ -235,6 +245,7 @@ > eina_benchmark_shutdown(); > eina_counter_shutdown(); > eina_array_shutdown(); > + eina_matrixsparse_shutdown(); > eina_list_shutdown(); > eina_stringshare_shutdown(); > eina_hash_shutdown(); > > Added: trunk/eina/src/lib/eina_matrixsparse.c > > Modified: trunk/eina/src/tests/Makefile.am > =================================================================== > --- trunk/eina/src/tests/Makefile.am 2009-09-04 12:03:12 UTC (rev 42242) > +++ trunk/eina/src/tests/Makefile.am 2009-09-04 13:43:44 UTC (rev 42243) > @@ -65,7 +65,8 @@ > eina_test_benchmark.c \ > eina_test_mempool.c \ > eina_test_rectangle.c \ > -eina_test_list.c > +eina_test_list.c \ > +eina_test_matrixsparse.c > > eina_suite_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libeina.la > > > Modified: trunk/eina/src/tests/eina_suite.c > =================================================================== > --- trunk/eina/src/tests/eina_suite.c 2009-09-04 12:03:12 UTC (rev 42242) > +++ trunk/eina/src/tests/eina_suite.c 2009-09-04 13:43:44 UTC (rev 42243) > @@ -53,6 +53,7 @@ > { "Benchmark", eina_test_benchmark }, > { "Mempool", eina_test_mempool }, > { "Rectangle", eina_test_rectangle }, > + { "Matrix Sparse", eina_test_matrixsparse }, > { NULL, NULL } > }; > > > Modified: trunk/eina/src/tests/eina_suite.h > =================================================================== > --- trunk/eina/src/tests/eina_suite.h 2009-09-04 12:03:12 UTC (rev 42242) > +++ trunk/eina/src/tests/eina_suite.h 2009-09-04 13:43:44 UTC (rev 42243) > @@ -41,5 +41,6 @@ > void eina_test_benchmark(TCase *tc); > void eina_test_mempool(TCase *tc); > void eina_test_rectangle(TCase *tc); > +void eina_test_matrixsparse(TCase *tc); > > #endif /* EINA_SUITE_H_ */ > > Added: trunk/eina/src/tests/eina_test_matrixsparse.c > > > ------------------------------------------------------------------------------ > Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day > trial. Simplify your report design, integration and deployment - and focus on > what you do best, core application coding. Discover what's new with > Crystal Reports now. http://p.sf.net/sfu/bobj-july > _______________________________________________ > enlightenment-svn mailing list > enl...@li... > https://lists.sourceforge.net/lists/listinfo/enlightenment-svn > > -- > Ce message a été vérifié par MailScanner > pour des virus ou des polluriels et rien de > suspect n'a été trouvé. > Message délivré par le serveur de messagerie de l'Université d'Evry. > > |