summaryrefslogtreecommitdiff
path: root/src/tests/eo
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-03-26 14:19:28 -0400
committerStefan Schmidt <stefan@osg.samsung.com>2018-04-05 11:10:25 +0200
commitadc601aca2f0a16784af36bf6ae7dd20eeb33202 (patch)
treecac0a78fa40e88abb028b06d985c28bf89da269c /src/tests/eo
parentb340b5e49ccae48a7d5adbbfa301af39e232348c (diff)
tests: add instrumentation to existing tests to find slow tests
efl_check.h must be included and the EFL_START/END_TEST macros must be used in place of normal START/END_TEST macros timing is enabled when TIMING_ENABLED is set https://phab.enlightenment.org/w/improve_tests/ Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Diffstat (limited to 'src/tests/eo')
-rw-r--r--src/tests/eo/suite/eo_suite.h2
-rw-r--r--src/tests/eo/suite/eo_test_call_errors.c16
-rw-r--r--src/tests/eo/suite/eo_test_class_behaviour_errors.c8
-rw-r--r--src/tests/eo/suite/eo_test_class_errors.c24
-rw-r--r--src/tests/eo/suite/eo_test_event.c12
-rw-r--r--src/tests/eo/suite/eo_test_general.c100
-rw-r--r--src/tests/eo/suite/eo_test_init.c8
-rw-r--r--src/tests/eo/suite/eo_test_threaded_calls.c4
-rw-r--r--src/tests/eo/suite/eo_test_value.c4
9 files changed, 89 insertions, 89 deletions
diff --git a/src/tests/eo/suite/eo_suite.h b/src/tests/eo/suite/eo_suite.h
index 173965fdf7..8895168248 100644
--- a/src/tests/eo/suite/eo_suite.h
+++ b/src/tests/eo/suite/eo_suite.h
@@ -2,7 +2,7 @@
2#define _EO_SUITE_H 2#define _EO_SUITE_H
3 3
4#include <check.h> 4#include <check.h>
5 5#include "../../efl_check.h"
6void eo_test_init(TCase *tc); 6void eo_test_init(TCase *tc);
7void eo_test_general(TCase *tc); 7void eo_test_general(TCase *tc);
8void eo_test_class_errors(TCase *tc); 8void eo_test_class_errors(TCase *tc);
diff --git a/src/tests/eo/suite/eo_test_call_errors.c b/src/tests/eo/suite/eo_test_call_errors.c
index c20f7f7e83..83d6eaac2b 100644
--- a/src/tests/eo/suite/eo_test_call_errors.c
+++ b/src/tests/eo/suite/eo_test_call_errors.c
@@ -12,7 +12,7 @@
12 12
13static struct log_ctx ctx; 13static struct log_ctx ctx;
14 14
15START_TEST(eo_pure_virtual_fct_call) 15EFL_START_TEST(eo_pure_virtual_fct_call)
16{ 16{
17 efl_object_init(); 17 efl_object_init();
18 eina_log_print_cb_set(eo_test_print_cb, &ctx); 18 eina_log_print_cb_set(eo_test_print_cb, &ctx);
@@ -28,9 +28,9 @@ START_TEST(eo_pure_virtual_fct_call)
28 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL); 28 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
29 efl_object_shutdown(); 29 efl_object_shutdown();
30} 30}
31END_TEST 31EFL_END_TEST
32 32
33START_TEST(eo_api_not_implemented_call) 33EFL_START_TEST(eo_api_not_implemented_call)
34{ 34{
35 efl_object_init(); 35 efl_object_init();
36 eina_log_print_cb_set(eo_test_print_cb, &ctx); 36 eina_log_print_cb_set(eo_test_print_cb, &ctx);
@@ -46,9 +46,9 @@ START_TEST(eo_api_not_implemented_call)
46 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL); 46 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
47 efl_object_shutdown(); 47 efl_object_shutdown();
48} 48}
49END_TEST 49EFL_END_TEST
50 50
51START_TEST(eo_op_not_found_in_super) 51EFL_START_TEST(eo_op_not_found_in_super)
52{ 52{
53 efl_object_init(); 53 efl_object_init();
54 eina_log_print_cb_set(eo_test_print_cb, &ctx); 54 eina_log_print_cb_set(eo_test_print_cb, &ctx);
@@ -64,7 +64,7 @@ START_TEST(eo_op_not_found_in_super)
64 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL); 64 eina_log_print_cb_set(eina_log_print_cb_stderr, NULL);
65 efl_object_shutdown(); 65 efl_object_shutdown();
66} 66}
67END_TEST 67EFL_END_TEST
68 68
69//the fallback code that will be called 69//the fallback code that will be called
70 70
@@ -110,7 +110,7 @@ static const Efl_Class_Description errorcase_class_desc = {
110 110
111EFL_DEFINE_CLASS(simple_errorcase_class_get, &errorcase_class_desc, EO_CLASS, NULL) 111EFL_DEFINE_CLASS(simple_errorcase_class_get, &errorcase_class_desc, EO_CLASS, NULL)
112 112
113START_TEST(eo_fallbackcall_execute) 113EFL_START_TEST(eo_fallbackcall_execute)
114{ 114{
115 efl_object_init(); 115 efl_object_init();
116 116
@@ -126,7 +126,7 @@ START_TEST(eo_fallbackcall_execute)
126 126
127 efl_object_shutdown(); 127 efl_object_shutdown();
128} 128}
129END_TEST 129EFL_END_TEST
130 130
131void eo_test_call_errors(TCase *tc) 131void eo_test_call_errors(TCase *tc)
132{ 132{
diff --git a/src/tests/eo/suite/eo_test_class_behaviour_errors.c b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
index c39fe0eff4..22591cb578 100644
--- a/src/tests/eo/suite/eo_test_class_behaviour_errors.c
+++ b/src/tests/eo/suite/eo_test_class_behaviour_errors.c
@@ -32,7 +32,7 @@ _destructor_unref_class_initializer(Efl_Class *klass2)
32 return efl_class_functions_set(klass2, &ops, NULL); 32 return efl_class_functions_set(klass2, &ops, NULL);
33} 33}
34 34
35START_TEST(efl_destructor_unref) 35EFL_START_TEST(efl_destructor_unref)
36{ 36{
37 efl_object_init(); 37 efl_object_init();
38 eina_log_print_cb_set(eo_test_print_cb, &ctx); 38 eina_log_print_cb_set(eo_test_print_cb, &ctx);
@@ -60,9 +60,9 @@ START_TEST(efl_destructor_unref)
60 60
61 efl_object_shutdown(); 61 efl_object_shutdown();
62} 62}
63END_TEST 63EFL_END_TEST
64 64
65START_TEST(efl_destructor_double_del) 65EFL_START_TEST(efl_destructor_double_del)
66{ 66{
67 efl_object_init(); 67 efl_object_init();
68 eina_log_print_cb_set(eo_test_print_cb, &ctx); 68 eina_log_print_cb_set(eo_test_print_cb, &ctx);
@@ -92,7 +92,7 @@ START_TEST(efl_destructor_double_del)
92 92
93 efl_object_shutdown(); 93 efl_object_shutdown();
94} 94}
95END_TEST 95EFL_END_TEST
96 96
97void eo_test_class_behaviour_errors(TCase *tc) 97void eo_test_class_behaviour_errors(TCase *tc)
98{ 98{
diff --git a/src/tests/eo/suite/eo_test_class_errors.c b/src/tests/eo/suite/eo_test_class_errors.c
index ef15c99707..e4d9e77954 100644
--- a/src/tests/eo/suite/eo_test_class_errors.c
+++ b/src/tests/eo/suite/eo_test_class_errors.c
@@ -12,7 +12,7 @@
12 12
13static struct log_ctx ctx; 13static struct log_ctx ctx;
14 14
15START_TEST(eo_inherit_errors) 15EFL_START_TEST(eo_inherit_errors)
16{ 16{
17 efl_object_init(); 17 efl_object_init();
18 eina_log_print_cb_set(eo_test_print_cb, &ctx); 18 eina_log_print_cb_set(eo_test_print_cb, &ctx);
@@ -74,9 +74,9 @@ START_TEST(eo_inherit_errors)
74 74
75 efl_object_shutdown(); 75 efl_object_shutdown();
76} 76}
77END_TEST 77EFL_END_TEST
78 78
79START_TEST(eo_inconsistent_mro) 79EFL_START_TEST(eo_inconsistent_mro)
80{ 80{
81 efl_object_init(); 81 efl_object_init();
82 eina_log_print_cb_set(eo_test_print_cb, &ctx); 82 eina_log_print_cb_set(eo_test_print_cb, &ctx);
@@ -150,11 +150,11 @@ START_TEST(eo_inconsistent_mro)
150 150
151 efl_object_shutdown(); 151 efl_object_shutdown();
152} 152}
153END_TEST 153EFL_END_TEST
154 154
155static void _stub_class_constructor(Efl_Class *klass EINA_UNUSED) {} 155static void _stub_class_constructor(Efl_Class *klass EINA_UNUSED) {}
156 156
157START_TEST(eo_bad_interface) 157EFL_START_TEST(eo_bad_interface)
158{ 158{
159 efl_object_init(); 159 efl_object_init();
160 eina_log_print_cb_set(eo_test_safety_print_cb, &ctx); 160 eina_log_print_cb_set(eo_test_safety_print_cb, &ctx);
@@ -197,7 +197,7 @@ START_TEST(eo_bad_interface)
197 197
198 efl_object_shutdown(); 198 efl_object_shutdown();
199} 199}
200END_TEST 200EFL_END_TEST
201 201
202static void _null_fct(Eo *eo_obj EINA_UNUSED, void *d EINA_UNUSED) { } 202static void _null_fct(Eo *eo_obj EINA_UNUSED, void *d EINA_UNUSED) { }
203void null_fct (void) {} 203void null_fct (void) {}
@@ -212,7 +212,7 @@ _null_class_initializer(Efl_Class *klass)
212 return efl_class_functions_set(klass, &ops, NULL); 212 return efl_class_functions_set(klass, &ops, NULL);
213} 213}
214 214
215START_TEST(eo_null_api) 215EFL_START_TEST(eo_null_api)
216{ 216{
217 efl_object_init(); 217 efl_object_init();
218 eina_log_print_cb_set(eo_test_print_cb, &ctx); 218 eina_log_print_cb_set(eo_test_print_cb, &ctx);
@@ -238,7 +238,7 @@ START_TEST(eo_null_api)
238 238
239 efl_object_shutdown(); 239 efl_object_shutdown();
240} 240}
241END_TEST 241EFL_END_TEST
242 242
243static Eina_Bool 243static Eina_Bool
244_redefined_class_initializer(Efl_Class *klass) 244_redefined_class_initializer(Efl_Class *klass)
@@ -251,7 +251,7 @@ _redefined_class_initializer(Efl_Class *klass)
251 return efl_class_functions_set(klass, &ops, NULL); 251 return efl_class_functions_set(klass, &ops, NULL);
252} 252}
253 253
254START_TEST(eo_api_redefined) 254EFL_START_TEST(eo_api_redefined)
255{ 255{
256 efl_object_init(); 256 efl_object_init();
257 eina_log_print_cb_set(eo_test_print_cb, &ctx); 257 eina_log_print_cb_set(eo_test_print_cb, &ctx);
@@ -277,7 +277,7 @@ START_TEST(eo_api_redefined)
277 277
278 efl_object_shutdown(); 278 efl_object_shutdown();
279} 279}
280END_TEST 280EFL_END_TEST
281 281
282static Eina_Bool 282static Eina_Bool
283_dich_func_class_initializer(Efl_Class *klass) 283_dich_func_class_initializer(Efl_Class *klass)
@@ -290,7 +290,7 @@ _dich_func_class_initializer(Efl_Class *klass)
290 return efl_class_functions_set(klass, &ops, NULL); 290 return efl_class_functions_set(klass, &ops, NULL);
291} 291}
292 292
293START_TEST(eo_dich_func_override) 293EFL_START_TEST(eo_dich_func_override)
294{ 294{
295 efl_object_init(); 295 efl_object_init();
296 eina_log_print_cb_set(eo_test_print_cb, &ctx); 296 eina_log_print_cb_set(eo_test_print_cb, &ctx);
@@ -316,7 +316,7 @@ START_TEST(eo_dich_func_override)
316 316
317 efl_object_shutdown(); 317 efl_object_shutdown();
318} 318}
319END_TEST 319EFL_END_TEST
320 320
321void eo_test_class_errors(TCase *tc) 321void eo_test_class_errors(TCase *tc)
322{ 322{
diff --git a/src/tests/eo/suite/eo_test_event.c b/src/tests/eo/suite/eo_test_event.c
index 43420e3791..7adc7fd29e 100644
--- a/src/tests/eo/suite/eo_test_event.c
+++ b/src/tests/eo/suite/eo_test_event.c
@@ -57,7 +57,7 @@ _cb1(void *data, const Efl_Event *event)
57 efl_event_callback_add(event->object, EFL_TEST_EVENT_EVENT_TESTER, _cb3, data); 57 efl_event_callback_add(event->object, EFL_TEST_EVENT_EVENT_TESTER, _cb3, data);
58} 58}
59 59
60START_TEST(eo_event) 60EFL_START_TEST(eo_event)
61{ 61{
62 Test_Data data; 62 Test_Data data;
63 efl_object_init(); 63 efl_object_init();
@@ -81,7 +81,7 @@ START_TEST(eo_event)
81 81
82 efl_object_shutdown(); 82 efl_object_shutdown();
83} 83}
84END_TEST 84EFL_END_TEST
85 85
86static void 86static void
87_cb_rec_3(void *data EINA_UNUSED, const Efl_Event *event) 87_cb_rec_3(void *data EINA_UNUSED, const Efl_Event *event)
@@ -117,7 +117,7 @@ _cb_rec_1(void *data, const Efl_Event *event)
117 } 117 }
118} 118}
119 119
120START_TEST(eo_event_call_in_call) 120EFL_START_TEST(eo_event_call_in_call)
121{ 121{
122 Test_Data data; 122 Test_Data data;
123 efl_object_init(); 123 efl_object_init();
@@ -134,7 +134,7 @@ START_TEST(eo_event_call_in_call)
134 134
135 efl_object_shutdown(); 135 efl_object_shutdown();
136} 136}
137END_TEST 137EFL_END_TEST
138 138
139static Eina_Bool emitted = 0; 139static Eina_Bool emitted = 0;
140 140
@@ -162,7 +162,7 @@ _generation_clamp_step1(void *data EINA_UNUSED, const Efl_Event *e)
162} 162}
163 163
164 164
165START_TEST(eo_event_generation_bug) 165EFL_START_TEST(eo_event_generation_bug)
166{ 166{
167 efl_object_init(); 167 efl_object_init();
168 168
@@ -189,7 +189,7 @@ START_TEST(eo_event_generation_bug)
189 189
190 efl_object_shutdown(); 190 efl_object_shutdown();
191} 191}
192END_TEST 192EFL_END_TEST
193 193
194 194
195void eo_test_event(TCase *tc) 195void eo_test_event(TCase *tc)
diff --git a/src/tests/eo/suite/eo_test_general.c b/src/tests/eo/suite/eo_test_general.c
index a9cba7d449..a52935a9aa 100644
--- a/src/tests/eo/suite/eo_test_general.c
+++ b/src/tests/eo/suite/eo_test_general.c
@@ -19,7 +19,7 @@
19/* Loading this internal header for testing purposes. */ 19/* Loading this internal header for testing purposes. */
20#include "eo_ptr_indirection.h" 20#include "eo_ptr_indirection.h"
21 21
22START_TEST(eo_simple) 22EFL_START_TEST(eo_simple)
23{ 23{
24 efl_object_init(); 24 efl_object_init();
25 Eo *obj = efl_add_ref(EO_CLASS, NULL); 25 Eo *obj = efl_add_ref(EO_CLASS, NULL);
@@ -33,9 +33,9 @@ START_TEST(eo_simple)
33 33
34 efl_object_shutdown(); 34 efl_object_shutdown();
35} 35}
36END_TEST 36EFL_END_TEST
37 37
38START_TEST(eo_singleton) 38EFL_START_TEST(eo_singleton)
39{ 39{
40 efl_object_init(); 40 efl_object_init();
41 41
@@ -52,7 +52,7 @@ START_TEST(eo_singleton)
52 52
53 efl_object_shutdown(); 53 efl_object_shutdown();
54} 54}
55END_TEST 55EFL_END_TEST
56 56
57#define OVERRIDE_A_SIMPLE 100859 57#define OVERRIDE_A_SIMPLE 100859
58#define OVERRIDE_A 324000 58#define OVERRIDE_A 324000
@@ -68,7 +68,7 @@ _simple_obj_override_a_double_set(Eo *obj, void *class_data EINA_UNUSED, int a)
68 simple_a_set(efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS), 2 * a); 68 simple_a_set(efl_super(obj, EFL_OBJECT_OVERRIDE_CLASS), 2 * a);
69} 69}
70 70
71START_TEST(efl_object_override_tests) 71EFL_START_TEST(efl_object_override_tests)
72{ 72{
73 efl_object_init(); 73 efl_object_init();
74 74
@@ -135,7 +135,7 @@ START_TEST(efl_object_override_tests)
135 135
136 efl_object_shutdown(); 136 efl_object_shutdown();
137} 137}
138END_TEST 138EFL_END_TEST
139 139
140static int _eo_signals_cb_current = 0; 140static int _eo_signals_cb_current = 0;
141static int _eo_signals_cb_flag = 0; 141static int _eo_signals_cb_flag = 0;
@@ -197,7 +197,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(_eo_signals_callbacks,
197{ EV_A_CHANGED, _eo_signals_a_changed_never }, 197{ EV_A_CHANGED, _eo_signals_a_changed_never },
198{ EFL_EVENT_DEL, _eo_signals_efl_del_cb }); 198{ EFL_EVENT_DEL, _eo_signals_efl_del_cb });
199 199
200START_TEST(eo_signals) 200EFL_START_TEST(eo_signals)
201{ 201{
202 efl_object_init(); 202 efl_object_init();
203 203
@@ -282,9 +282,9 @@ START_TEST(eo_signals)
282 282
283 efl_object_shutdown(); 283 efl_object_shutdown();
284} 284}
285END_TEST 285EFL_END_TEST
286 286
287START_TEST(efl_data_fetch) 287EFL_START_TEST(efl_data_fetch)
288{ 288{
289 efl_object_init(); 289 efl_object_init();
290 290
@@ -321,9 +321,9 @@ START_TEST(efl_data_fetch)
321 321
322 efl_object_shutdown(); 322 efl_object_shutdown();
323} 323}
324END_TEST 324EFL_END_TEST
325 325
326START_TEST(efl_data_safe_fetch) 326EFL_START_TEST(efl_data_safe_fetch)
327{ 327{
328 efl_object_init(); 328 efl_object_init();
329 329
@@ -345,9 +345,9 @@ START_TEST(efl_data_safe_fetch)
345 345
346 efl_object_shutdown(); 346 efl_object_shutdown();
347} 347}
348END_TEST 348EFL_END_TEST
349 349
350START_TEST(efl_isa_tests) 350EFL_START_TEST(efl_isa_tests)
351{ 351{
352 efl_object_init(); 352 efl_object_init();
353 353
@@ -421,10 +421,10 @@ START_TEST(efl_isa_tests)
421 421
422 efl_object_shutdown(); 422 efl_object_shutdown();
423} 423}
424END_TEST 424EFL_END_TEST
425 425
426 426
427START_TEST(efl_composite_tests) 427EFL_START_TEST(efl_composite_tests)
428{ 428{
429 efl_object_init(); 429 efl_object_init();
430 430
@@ -454,7 +454,7 @@ START_TEST(efl_composite_tests)
454 454
455 efl_object_shutdown(); 455 efl_object_shutdown();
456} 456}
457END_TEST 457EFL_END_TEST
458 458
459static Eina_Bool _man_should_con = EINA_TRUE; 459static Eina_Bool _man_should_con = EINA_TRUE;
460static Eina_Bool _man_should_des = EINA_TRUE; 460static Eina_Bool _man_should_des = EINA_TRUE;
@@ -487,7 +487,7 @@ _class_initializer(Efl_Class *klass)
487 return efl_class_functions_set(klass, &ops, NULL); 487 return efl_class_functions_set(klass, &ops, NULL);
488} 488}
489 489
490START_TEST(eo_man_free) 490EFL_START_TEST(eo_man_free)
491{ 491{
492 efl_object_init(); 492 efl_object_init();
493 493
@@ -566,9 +566,9 @@ START_TEST(eo_man_free)
566 566
567 efl_object_shutdown(); 567 efl_object_shutdown();
568} 568}
569END_TEST 569EFL_END_TEST
570 570
571START_TEST(efl_refs) 571EFL_START_TEST(efl_refs)
572{ 572{
573 efl_object_init(); 573 efl_object_init();
574 Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL); 574 Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -699,9 +699,9 @@ START_TEST(efl_refs)
699 699
700 efl_object_shutdown(); 700 efl_object_shutdown();
701} 701}
702END_TEST 702EFL_END_TEST
703 703
704START_TEST(efl_weak_reference) 704EFL_START_TEST(efl_weak_reference)
705{ 705{
706 efl_object_init(); 706 efl_object_init();
707 707
@@ -770,9 +770,9 @@ START_TEST(efl_weak_reference)
770 770
771 efl_object_shutdown(); 771 efl_object_shutdown();
772} 772}
773END_TEST 773EFL_END_TEST
774 774
775START_TEST(eo_generic_data) 775EFL_START_TEST(eo_generic_data)
776{ 776{
777 efl_object_init(); 777 efl_object_init();
778 Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL); 778 Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -943,10 +943,10 @@ START_TEST(eo_generic_data)
943 943
944 efl_object_shutdown(); 944 efl_object_shutdown();
945} 945}
946END_TEST 946EFL_END_TEST
947 947
948 948
949START_TEST(eo_magic_checks) 949EFL_START_TEST(eo_magic_checks)
950{ 950{
951 char _buf[sizeof(long)]; /* Just enough to hold eina magic + a bit more. */ 951 char _buf[sizeof(long)]; /* Just enough to hold eina magic + a bit more. */
952 char *buf = _buf; 952 char *buf = _buf;
@@ -1035,7 +1035,7 @@ START_TEST(eo_magic_checks)
1035 1035
1036 efl_object_shutdown(); 1036 efl_object_shutdown();
1037} 1037}
1038END_TEST 1038EFL_END_TEST
1039 1039
1040/* resolve issues */ 1040/* resolve issues */
1041 1041
@@ -1059,7 +1059,7 @@ _multi_class_initializer(Efl_Class *klass)
1059 return efl_class_functions_set(klass, &ops, NULL); 1059 return efl_class_functions_set(klass, &ops, NULL);
1060} 1060}
1061 1061
1062START_TEST(efl_func_resolve) 1062EFL_START_TEST(efl_func_resolve)
1063{ 1063{
1064 efl_object_init(); 1064 efl_object_init();
1065 1065
@@ -1095,9 +1095,9 @@ START_TEST(efl_func_resolve)
1095 1095
1096 efl_object_shutdown(); 1096 efl_object_shutdown();
1097} 1097}
1098END_TEST 1098EFL_END_TEST
1099 1099
1100START_TEST(efl_add_do_and_custom) 1100EFL_START_TEST(efl_add_do_and_custom)
1101{ 1101{
1102 Simple_Public_Data *pd = NULL; 1102 Simple_Public_Data *pd = NULL;
1103 Eo *obj = NULL; 1103 Eo *obj = NULL;
@@ -1129,9 +1129,9 @@ START_TEST(efl_add_do_and_custom)
1129 1129
1130 efl_object_shutdown(); 1130 efl_object_shutdown();
1131} 1131}
1132END_TEST 1132EFL_END_TEST
1133 1133
1134START_TEST(eo_pointers_indirection) 1134EFL_START_TEST(eo_pointers_indirection)
1135{ 1135{
1136#ifdef HAVE_EO_ID 1136#ifdef HAVE_EO_ID
1137 efl_object_init(); 1137 efl_object_init();
@@ -1216,7 +1216,7 @@ START_TEST(eo_pointers_indirection)
1216 efl_object_shutdown(); 1216 efl_object_shutdown();
1217#endif 1217#endif
1218} 1218}
1219END_TEST 1219EFL_END_TEST
1220 1220
1221 1221
1222static Eo * 1222static Eo *
@@ -1235,7 +1235,7 @@ _add_failures_class_initializer(Efl_Class *klass)
1235 return efl_class_functions_set(klass, &ops, NULL); 1235 return efl_class_functions_set(klass, &ops, NULL);
1236} 1236}
1237 1237
1238START_TEST(efl_add_failures) 1238EFL_START_TEST(efl_add_failures)
1239{ 1239{
1240 efl_object_init(); 1240 efl_object_init();
1241 1241
@@ -1257,7 +1257,7 @@ START_TEST(efl_add_failures)
1257 1257
1258 efl_object_shutdown(); 1258 efl_object_shutdown();
1259} 1259}
1260END_TEST 1260EFL_END_TEST
1261 1261
1262#ifdef HAVE_EO_ID 1262#ifdef HAVE_EO_ID
1263static Eina_Bool intercepted = EINA_FALSE; 1263static Eina_Bool intercepted = EINA_FALSE;
@@ -1277,7 +1277,7 @@ _del_intercept_reuse(Eo *obj)
1277} 1277}
1278#endif 1278#endif
1279 1279
1280START_TEST(efl_del_intercept) 1280EFL_START_TEST(efl_del_intercept)
1281{ 1281{
1282#ifdef HAVE_EO_ID 1282#ifdef HAVE_EO_ID
1283 efl_object_init(); 1283 efl_object_init();
@@ -1333,9 +1333,9 @@ START_TEST(efl_del_intercept)
1333 efl_object_shutdown(); 1333 efl_object_shutdown();
1334#endif 1334#endif
1335} 1335}
1336END_TEST 1336EFL_END_TEST
1337 1337
1338START_TEST(efl_name) 1338EFL_START_TEST(efl_name)
1339{ 1339{
1340 efl_object_init(); 1340 efl_object_init();
1341 Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL); 1341 Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -1390,9 +1390,9 @@ START_TEST(efl_name)
1390 1390
1391 efl_object_shutdown(); 1391 efl_object_shutdown();
1392} 1392}
1393END_TEST 1393EFL_END_TEST
1394 1394
1395START_TEST(eo_comment) 1395EFL_START_TEST(eo_comment)
1396{ 1396{
1397 efl_object_init(); 1397 efl_object_init();
1398 Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL); 1398 Eo *obj = efl_add_ref(SIMPLE_CLASS, NULL);
@@ -1420,9 +1420,9 @@ START_TEST(eo_comment)
1420 1420
1421 efl_object_shutdown(); 1421 efl_object_shutdown();
1422} 1422}
1423END_TEST 1423EFL_END_TEST
1424 1424
1425START_TEST(eo_rec_interface) 1425EFL_START_TEST(eo_rec_interface)
1426{ 1426{
1427 efl_object_init(); 1427 efl_object_init();
1428 Eo *s = efl_add_ref(SEARCHABLE_CLASS, NULL); 1428 Eo *s = efl_add_ref(SEARCHABLE_CLASS, NULL);
@@ -1437,7 +1437,7 @@ START_TEST(eo_rec_interface)
1437 1437
1438 efl_object_shutdown(); 1438 efl_object_shutdown();
1439} 1439}
1440END_TEST 1440EFL_END_TEST
1441 1441
1442typedef struct 1442typedef struct
1443{ 1443{
@@ -1530,7 +1530,7 @@ _timeout(int val EINA_UNUSED)
1530} 1530}
1531#endif 1531#endif
1532 1532
1533START_TEST(eo_domain) 1533EFL_START_TEST(eo_domain)
1534{ 1534{
1535 Eo *obj, *objs; 1535 Eo *obj, *objs;
1536 1536
@@ -1621,7 +1621,7 @@ START_TEST(eo_domain)
1621 signal(SIGALRM, NULL); 1621 signal(SIGALRM, NULL);
1622#endif 1622#endif
1623} 1623}
1624END_TEST 1624EFL_END_TEST
1625 1625
1626 1626
1627static int 1627static int
@@ -1652,7 +1652,7 @@ _cast_inherit_class_initializer_2(Efl_Class *klass)
1652 return efl_class_functions_set(klass, &ops, NULL); 1652 return efl_class_functions_set(klass, &ops, NULL);
1653} 1653}
1654 1654
1655START_TEST(efl_cast_test) 1655EFL_START_TEST(efl_cast_test)
1656{ 1656{
1657 efl_object_init(); 1657 efl_object_init();
1658 1658
@@ -1717,7 +1717,7 @@ START_TEST(efl_cast_test)
1717 1717
1718 efl_object_shutdown(); 1718 efl_object_shutdown();
1719} 1719}
1720END_TEST 1720EFL_END_TEST
1721 1721
1722static void _destruct_test_del_cb(void *data, const Efl_Event *ev EINA_UNUSED) 1722static void _destruct_test_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
1723{ 1723{
@@ -1737,7 +1737,7 @@ static void _destruct_test_destruct_cb(void *data, const Efl_Event *ev)
1737 //ck_assert_int_ne(efl_destructed_is(ev->object), 0); 1737 //ck_assert_int_ne(efl_destructed_is(ev->object), 0);
1738} 1738}
1739 1739
1740START_TEST(efl_object_destruct_test) 1740EFL_START_TEST(efl_object_destruct_test)
1741{ 1741{
1742 int var = 0; 1742 int var = 0;
1743 Eo *obj; 1743 Eo *obj;
@@ -1755,7 +1755,7 @@ START_TEST(efl_object_destruct_test)
1755 1755
1756 efl_object_shutdown(); 1756 efl_object_shutdown();
1757} 1757}
1758END_TEST 1758EFL_END_TEST
1759 1759
1760static void 1760static void
1761_auto_unref_del_cb(void *data, const Efl_Event *ev EINA_UNUSED) 1761_auto_unref_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
@@ -1763,7 +1763,7 @@ _auto_unref_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
1763 *((int *) data) = 1; 1763 *((int *) data) = 1;
1764} 1764}
1765 1765
1766START_TEST(efl_object_auto_unref_test) 1766EFL_START_TEST(efl_object_auto_unref_test)
1767{ 1767{
1768 int _auto_unref_del; 1768 int _auto_unref_del;
1769 Eo *obj, *parent; 1769 Eo *obj, *parent;
@@ -1808,7 +1808,7 @@ START_TEST(efl_object_auto_unref_test)
1808 1808
1809 efl_object_shutdown(); 1809 efl_object_shutdown();
1810} 1810}
1811END_TEST 1811EFL_END_TEST
1812 1812
1813void eo_test_general(TCase *tc) 1813void eo_test_general(TCase *tc)
1814{ 1814{
diff --git a/src/tests/eo/suite/eo_test_init.c b/src/tests/eo/suite/eo_test_init.c
index a625847b7d..31e16d2099 100644
--- a/src/tests/eo/suite/eo_test_init.c
+++ b/src/tests/eo/suite/eo_test_init.c
@@ -7,16 +7,16 @@
7#include "eo_suite.h" 7#include "eo_suite.h"
8#include "eo_test_class_simple.h" 8#include "eo_test_class_simple.h"
9 9
10START_TEST(eo_test_simple) 10EFL_START_TEST(eo_test_simple)
11{ 11{
12 fail_if(!efl_object_init()); /* one init by test suite */ 12 fail_if(!efl_object_init()); /* one init by test suite */
13 fail_if(!efl_object_init()); 13 fail_if(!efl_object_init());
14 fail_if(!efl_object_shutdown()); 14 fail_if(!efl_object_shutdown());
15 fail_if(efl_object_shutdown()); 15 fail_if(efl_object_shutdown());
16} 16}
17END_TEST 17EFL_END_TEST
18 18
19START_TEST(eo_test_init_shutdown) 19EFL_START_TEST(eo_test_init_shutdown)
20{ 20{
21 Eo *obj; 21 Eo *obj;
22 22
@@ -40,7 +40,7 @@ START_TEST(eo_test_init_shutdown)
40 ck_assert_int_eq(0xBEEF, simple2_class_beef_get(SIMPLE2_CLASS)); 40 ck_assert_int_eq(0xBEEF, simple2_class_beef_get(SIMPLE2_CLASS));
41 fail_if(efl_object_shutdown()); 41 fail_if(efl_object_shutdown());
42} 42}
43END_TEST 43EFL_END_TEST
44 44
45void eo_test_init(TCase *tc) 45void eo_test_init(TCase *tc)
46{ 46{
diff --git a/src/tests/eo/suite/eo_test_threaded_calls.c b/src/tests/eo/suite/eo_test_threaded_calls.c
index a42de16352..92d023c6dd 100644
--- a/src/tests/eo/suite/eo_test_threaded_calls.c
+++ b/src/tests/eo/suite/eo_test_threaded_calls.c
@@ -111,7 +111,7 @@ _thread_job(void *data, Eina_Thread t EINA_UNUSED)
111 return (void *) (uintptr_t) v; 111 return (void *) (uintptr_t) v;
112} 112}
113 113
114START_TEST(eo_threaded_calls_test) 114EFL_START_TEST(eo_threaded_calls_test)
115{ 115{
116 Eina_Thread threads[2]; 116 Eina_Thread threads[2];
117 117
@@ -135,7 +135,7 @@ START_TEST(eo_threaded_calls_test)
135 135
136 efl_object_shutdown(); 136 efl_object_shutdown();
137} 137}
138END_TEST 138EFL_END_TEST
139 139
140void eo_test_threaded_calls(TCase *tc) 140void eo_test_threaded_calls(TCase *tc)
141{ 141{
diff --git a/src/tests/eo/suite/eo_test_value.c b/src/tests/eo/suite/eo_test_value.c
index 19ce91c331..36709a9043 100644
--- a/src/tests/eo/suite/eo_test_value.c
+++ b/src/tests/eo/suite/eo_test_value.c
@@ -9,7 +9,7 @@
9#include "eo_suite.h" 9#include "eo_suite.h"
10#include "eo_test_class_simple.h" 10#include "eo_test_class_simple.h"
11 11
12START_TEST(eo_value) 12EFL_START_TEST(eo_value)
13{ 13{
14 efl_object_init(); 14 efl_object_init();
15 char *str, *str2; 15 char *str, *str2;
@@ -47,7 +47,7 @@ START_TEST(eo_value)
47 47
48 efl_object_shutdown(); 48 efl_object_shutdown();
49} 49}
50END_TEST 50EFL_END_TEST
51 51
52void eo_test_value(TCase *tc) 52void eo_test_value(TCase *tc)
53{ 53{