From: Enlightenment S. <no-...@en...> - 2008-09-18 07:17:49
|
Author: cedric Date: 2008-09-18 07:17:48 -0700 (Thu, 18 Sep 2008) New Revision: 36079 Log: Set module path for all tests. Modified: trunk/PROTO/eina/src/tests/eina_suite.c trunk/PROTO/eina/src/tests/eina_test_mempool.c Modified: trunk/PROTO/eina/src/tests/eina_suite.c =================================================================== --- trunk/PROTO/eina/src/tests/eina_suite.c 2008-09-18 14:16:47 UTC (rev 36078) +++ trunk/PROTO/eina/src/tests/eina_suite.c 2008-09-18 14:17:48 UTC (rev 36079) @@ -17,6 +17,7 @@ */ #include "eina_suite.h" +#include "eina_mempool.h" typedef struct _Eina_Test_Case Eina_Test_Case; struct _Eina_Test_Case @@ -71,6 +72,7 @@ int main(void) { + Eina_Module_Group *gp; Suite *s; SRunner *sr; int failed_count; @@ -78,9 +80,18 @@ s = eina_build_suite(); sr = srunner_create(s); + + eina_mempool_init(); + + eina_module_root_add(PACKAGE_BUILD_DIR"/src/tests"); + gp = eina_mempool_module_group_get(); + eina_module_path_register(gp, PACKAGE_BUILD_DIR"/src/modules", EINA_TRUE); + srunner_run_all(sr, CK_NORMAL); failed_count = srunner_ntests_failed(sr); srunner_free(sr); + eina_mempool_shutdown(); + return (failed_count == 0) ? 0 : 255; } Modified: trunk/PROTO/eina/src/tests/eina_test_mempool.c =================================================================== --- trunk/PROTO/eina/src/tests/eina_test_mempool.c 2008-09-18 14:16:47 UTC (rev 36078) +++ trunk/PROTO/eina/src/tests/eina_test_mempool.c 2008-09-18 14:17:48 UTC (rev 36079) @@ -25,16 +25,10 @@ START_TEST(eina_mempool_init_shutdown) { - Eina_Module_Group *gp; Eina_Mempool *mp; eina_mempool_init(); - gp = eina_mempool_module_group_get(); - fail_if(!gp); - - eina_module_path_register(gp, PACKAGE_BUILD_DIR"/src/modules", EINA_TRUE); - mp = eina_mempool_new("test", "test", NULL); fail_if(mp != NULL); @@ -44,19 +38,12 @@ START_TEST(eina_mempool_chained_mempool) { - Eina_Module_Group *gp; Eina_Mempool *mp; int *tbl[512]; int i; eina_mempool_init(); - eina_module_root_add(PACKAGE_BUILD_DIR"/src/tests"); - - gp = eina_mempool_module_group_get(); - fail_if(!gp); - eina_module_path_register(gp, PACKAGE_BUILD_DIR"/src/modules", EINA_TRUE); - mp = eina_mempool_new("chained_mempool", "test", NULL, sizeof (int), 256); fail_if(!mp); @@ -83,19 +70,12 @@ START_TEST(eina_mempool_pass_through) { - Eina_Module_Group *gp; Eina_Mempool *mp; int *tbl[512]; int i; eina_mempool_init(); - eina_module_root_add(PACKAGE_BUILD_DIR"/src/tests"); - - gp = eina_mempool_module_group_get(); - fail_if(!gp); - eina_module_path_register(gp, PACKAGE_BUILD_DIR"/src/modules", EINA_TRUE); - mp = eina_mempool_new("pass_through", "test", NULL, sizeof (int), 8, 0); fail_if(!mp); @@ -123,19 +103,12 @@ #ifdef EINA_EMEMOA_SUPPORT START_TEST(eina_mempool_ememoa_fixed) { - Eina_Module_Group *gp; Eina_Mempool *mp; int *tbl[512]; int i; eina_mempool_init(); - eina_module_root_add(PACKAGE_BUILD_DIR"/src/tests"); - - gp = eina_mempool_module_group_get(); - fail_if(!gp); - eina_module_path_register(gp, PACKAGE_BUILD_DIR"/src/modules", EINA_TRUE); - mp = eina_mempool_new("ememoa_fixed", "test", NULL, sizeof (int), 8, 0); fail_if(!mp); @@ -165,19 +138,12 @@ START_TEST(eina_mempool_ememoa_unknown) { - Eina_Module_Group *gp; Eina_Mempool *mp; int *tbl[512]; int i; eina_mempool_init(); - eina_module_root_add(PACKAGE_BUILD_DIR"/src/tests"); - - gp = eina_mempool_module_group_get(); - fail_if(!gp); - eina_module_path_register(gp, PACKAGE_BUILD_DIR"/src/modules", EINA_TRUE); - mp = eina_mempool_new("ememoa_unknown", "test", NULL, 0, 2, sizeof (int), 8, sizeof (int) * 2, 8); fail_if(!mp); |