summaryrefslogtreecommitdiff
path: root/src
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
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')
-rw-r--r--src/tests/ecore/ecore_suite.h2
-rw-r--r--src/tests/ecore/ecore_test_animator.c12
-rw-r--r--src/tests/ecore/ecore_test_args.c12
-rw-r--r--src/tests/ecore/ecore_test_ecore.c72
-rw-r--r--src/tests/ecore/ecore_test_ecore_audio.c36
-rw-r--r--src/tests/ecore/ecore_test_ecore_drm.c8
-rw-r--r--src/tests/ecore/ecore_test_ecore_evas.c8
-rw-r--r--src/tests/ecore/ecore_test_ecore_fb.c4
-rw-r--r--src/tests/ecore/ecore_test_ecore_file.c20
-rw-r--r--src/tests/ecore/ecore_test_ecore_imf.c12
-rw-r--r--src/tests/ecore/ecore_test_ecore_input.c4
-rw-r--r--src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c28
-rw-r--r--src/tests/ecore/ecore_test_ecore_x.c8
-rw-r--r--src/tests/ecore/ecore_test_job.c4
-rw-r--r--src/tests/ecore/ecore_test_promise.c84
-rw-r--r--src/tests/ecore/ecore_test_promise2.c96
-rw-r--r--src/tests/ecore/ecore_test_timer.c16
-rw-r--r--src/tests/ecore/efl_app_suite.c8
-rw-r--r--src/tests/ecore/efl_app_suite.h2
-rw-r--r--src/tests/ecore_con/ecore_con_suite.h2
-rw-r--r--src/tests/ecore_con/ecore_con_test_ecore_con.c96
-rw-r--r--src/tests/ecore_con/ecore_con_test_ecore_con_eet.c8
-rw-r--r--src/tests/ecore_con/ecore_con_test_ecore_con_url.c32
-rw-r--r--src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c80
-rw-r--r--src/tests/ecore_cxx/ecore_cxx_suite.h2
-rw-r--r--src/tests/ector/suite/ector_suite.h2
-rw-r--r--src/tests/ector/suite/ector_test_init.c4
-rw-r--r--src/tests/edje/edje_suite.h2
-rw-r--r--src/tests/edje/edje_test_edje.c92
-rw-r--r--src/tests/eet/eet_suite.h2
-rw-r--r--src/tests/eet/eet_test_cache.c4
-rw-r--r--src/tests/eet/eet_test_cipher.c4
-rw-r--r--src/tests/eet/eet_test_connection.c4
-rw-r--r--src/tests/eet/eet_test_data.c36
-rw-r--r--src/tests/eet/eet_test_file.c16
-rw-r--r--src/tests/eet/eet_test_identity.c16
-rw-r--r--src/tests/eet/eet_test_image.c8
-rw-r--r--src/tests/eet/eet_test_init.c4
-rw-r--r--src/tests/eet_cxx/eet_cxx_suite.h2
-rw-r--r--src/tests/eeze/eeze_suite.h2
-rw-r--r--src/tests/eeze/eeze_test_init.c4
-rw-r--r--src/tests/eeze/eeze_test_net.c12
-rw-r--r--src/tests/eeze/eeze_test_sensor.c12
-rw-r--r--src/tests/eeze/eeze_test_udev.c20
-rw-r--r--src/tests/efl/efl_suite.h2
-rw-r--r--src/tests/efl/efl_test_model_composite.c8
-rw-r--r--src/tests/efl/efl_test_model_container.c4
-rw-r--r--src/tests/efl_check.h85
-rw-r--r--src/tests/efreet/efreet_suite.h2
-rw-r--r--src/tests/efreet/efreet_test_efreet.c4
-rw-r--r--src/tests/efreet/efreet_test_efreet_cache.c4
-rw-r--r--src/tests/eina/eina_suite.h1
-rw-r--r--src/tests/eina/eina_test_abi.c8
-rw-r--r--src/tests/eina/eina_test_accessor.c12
-rw-r--r--src/tests/eina/eina_test_array.c12
-rw-r--r--src/tests/eina/eina_test_barrier.c4
-rw-r--r--src/tests/eina/eina_test_benchmark.c4
-rw-r--r--src/tests/eina/eina_test_bezier.c32
-rw-r--r--src/tests/eina/eina_test_binbuf.c28
-rw-r--r--src/tests/eina/eina_test_binshare.c20
-rw-r--r--src/tests/eina/eina_test_clist.c4
-rw-r--r--src/tests/eina/eina_test_convert.c12
-rw-r--r--src/tests/eina/eina_test_counter.c8
-rw-r--r--src/tests/eina/eina_test_cow.c8
-rw-r--r--src/tests/eina/eina_test_crc.c4
-rw-r--r--src/tests/eina/eina_test_error.c20
-rw-r--r--src/tests/eina/eina_test_file.c48
-rw-r--r--src/tests/eina/eina_test_fp.c16
-rw-r--r--src/tests/eina/eina_test_freeq.c16
-rw-r--r--src/tests/eina/eina_test_hash.c36
-rw-r--r--src/tests/eina/eina_test_inarray.c28
-rw-r--r--src/tests/eina/eina_test_inlist.c12
-rw-r--r--src/tests/eina/eina_test_iterator.c32
-rw-r--r--src/tests/eina/eina_test_lalloc.c4
-rw-r--r--src/tests/eina/eina_test_list.c28
-rw-r--r--src/tests/eina/eina_test_lock.c12
-rw-r--r--src/tests/eina/eina_test_log.c28
-rw-r--r--src/tests/eina/eina_test_magic.c4
-rw-r--r--src/tests/eina/eina_test_main.c12
-rw-r--r--src/tests/eina/eina_test_matrix.c40
-rw-r--r--src/tests/eina/eina_test_matrixsparse.c12
-rw-r--r--src/tests/eina/eina_test_mempool.c8
-rw-r--r--src/tests/eina/eina_test_module.c8
-rw-r--r--src/tests/eina/eina_test_quad.c4
-rw-r--r--src/tests/eina/eina_test_quadtree.c4
-rw-r--r--src/tests/eina/eina_test_quaternion.c68
-rw-r--r--src/tests/eina/eina_test_rbtree.c28
-rw-r--r--src/tests/eina/eina_test_rectangle.c16
-rw-r--r--src/tests/eina/eina_test_safepointer.c12
-rw-r--r--src/tests/eina/eina_test_sched.c8
-rw-r--r--src/tests/eina/eina_test_simple_xml_parser.c16
-rw-r--r--src/tests/eina/eina_test_slice.c20
-rw-r--r--src/tests/eina/eina_test_slstr.c32
-rw-r--r--src/tests/eina/eina_test_str.c28
-rw-r--r--src/tests/eina/eina_test_strbuf.c60
-rw-r--r--src/tests/eina/eina_test_tiler.c20
-rw-r--r--src/tests/eina/eina_test_tmpstr.c20
-rw-r--r--src/tests/eina/eina_test_trash.c4
-rw-r--r--src/tests/eina/eina_test_ustr.c40
-rw-r--r--src/tests/eina/eina_test_ustringshare.c12
-rw-r--r--src/tests/eina/eina_test_value.c108
-rw-r--r--src/tests/eina/eina_test_vector.c8
-rw-r--r--src/tests/eina/eina_test_vpath.c10
-rw-r--r--src/tests/eina/eina_test_xattr.c12
-rw-r--r--src/tests/eina_cxx/eina_cxx_suite.h2
-rw-r--r--src/tests/eio/eio_model_test_file.c7
-rw-r--r--src/tests/eio/eio_model_test_monitor_add.c6
-rw-r--r--src/tests/eio/eio_suite.h2
-rw-r--r--src/tests/eio/eio_test_eet.c8
-rw-r--r--src/tests/eio/eio_test_file.c12
-rw-r--r--src/tests/eio/eio_test_manager.c16
-rw-r--r--src/tests/eio/eio_test_manager_xattr.c4
-rw-r--r--src/tests/eio/eio_test_map.c4
-rw-r--r--src/tests/eio/eio_test_monitor.c84
-rw-r--r--src/tests/eio/eio_test_sentry.c80
-rw-r--r--src/tests/eio/eio_test_xattr.c8
-rw-r--r--src/tests/eldbus/eldbus_suite.h2
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_init.c20
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_message.c56
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model.c12
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_connection.c28
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_method.c32
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_object.c28
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_proxy.c28
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_model_signal.c32
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_object.c12
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_pending_cancel.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_pending_data.c4
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_proxy.c16
-rw-r--r--src/tests/eldbus/eldbus_test_eldbus_signal_handler.c20
-rw-r--r--src/tests/eldbus/eldbus_test_fake_server_eldbus_model_proxy.c28
-rw-r--r--src/tests/eldbus_cxx/eldbus_cxx_suite.h2
-rw-r--r--src/tests/elementary/efl_ui_suite.c4
-rw-r--r--src/tests/elementary/elm_code_file_test_load.c28
-rw-r--r--src/tests/elementary/elm_code_file_test_memory.c8
-rw-r--r--src/tests/elementary/elm_code_test_basic.c8
-rw-r--r--src/tests/elementary/elm_code_test_indent.c20
-rw-r--r--src/tests/elementary/elm_code_test_line.c12
-rw-r--r--src/tests/elementary/elm_code_test_parse.c12
-rw-r--r--src/tests/elementary/elm_code_test_syntax.c12
-rw-r--r--src/tests/elementary/elm_code_test_text.c24
-rw-r--r--src/tests/elementary/elm_code_test_widget.c12
-rw-r--r--src/tests/elementary/elm_code_test_widget_selection.c72
-rw-r--r--src/tests/elementary/elm_code_test_widget_text.c8
-rw-r--r--src/tests/elementary/elm_code_test_widget_undo.c8
-rw-r--r--src/tests/elementary/elm_suite.h2
-rw-r--r--src/tests/elementary/elm_test_actionslider.c8
-rw-r--r--src/tests/elementary/elm_test_atspi.c64
-rw-r--r--src/tests/elementary/elm_test_bg.c8
-rw-r--r--src/tests/elementary/elm_test_box.c8
-rw-r--r--src/tests/elementary/elm_test_bubble.c8
-rw-r--r--src/tests/elementary/elm_test_button.c12
-rw-r--r--src/tests/elementary/elm_test_calendar.c8
-rw-r--r--src/tests/elementary/elm_test_check.c16
-rw-r--r--src/tests/elementary/elm_test_clock.c8
-rw-r--r--src/tests/elementary/elm_test_colorselector.c12
-rw-r--r--src/tests/elementary/elm_test_config.c12
-rw-r--r--src/tests/elementary/elm_test_conformant.c8
-rw-r--r--src/tests/elementary/elm_test_ctxpopup.c8
-rw-r--r--src/tests/elementary/elm_test_datetime.c8
-rw-r--r--src/tests/elementary/elm_test_dayselector.c8
-rw-r--r--src/tests/elementary/elm_test_diskselector.c8
-rw-r--r--src/tests/elementary/elm_test_entry.c48
-rw-r--r--src/tests/elementary/elm_test_fileselector.c12
-rw-r--r--src/tests/elementary/elm_test_fileselector_button.c8
-rw-r--r--src/tests/elementary/elm_test_fileselector_entry.c8
-rw-r--r--src/tests/elementary/elm_test_flip.c8
-rw-r--r--src/tests/elementary/elm_test_flipselector.c8
-rw-r--r--src/tests/elementary/elm_test_focus.c96
-rw-r--r--src/tests/elementary/elm_test_focus_sub.c12
-rw-r--r--src/tests/elementary/elm_test_frame.c8
-rw-r--r--src/tests/elementary/elm_test_gengrid.c12
-rw-r--r--src/tests/elementary/elm_test_genlist.c32
-rw-r--r--src/tests/elementary/elm_test_glview.c8
-rw-r--r--src/tests/elementary/elm_test_grid.c8
-rw-r--r--src/tests/elementary/elm_test_hover.c8
-rw-r--r--src/tests/elementary/elm_test_hoversel.c8
-rw-r--r--src/tests/elementary/elm_test_icon.c8
-rw-r--r--src/tests/elementary/elm_test_image.c20
-rw-r--r--src/tests/elementary/elm_test_index.c8
-rw-r--r--src/tests/elementary/elm_test_init.c4
-rw-r--r--src/tests/elementary/elm_test_inwin.c8
-rw-r--r--src/tests/elementary/elm_test_label.c8
-rw-r--r--src/tests/elementary/elm_test_layout.c16
-rw-r--r--src/tests/elementary/elm_test_list.c40
-rw-r--r--src/tests/elementary/elm_test_map.c8
-rw-r--r--src/tests/elementary/elm_test_mapbuf.c8
-rw-r--r--src/tests/elementary/elm_test_menu.c8
-rw-r--r--src/tests/elementary/elm_test_multibuttonentry.c8
-rw-r--r--src/tests/elementary/elm_test_naviframe.c8
-rw-r--r--src/tests/elementary/elm_test_notify.c8
-rw-r--r--src/tests/elementary/elm_test_panel.c8
-rw-r--r--src/tests/elementary/elm_test_panes.c8
-rw-r--r--src/tests/elementary/elm_test_photo.c8
-rw-r--r--src/tests/elementary/elm_test_photocam.c12
-rw-r--r--src/tests/elementary/elm_test_player.c8
-rw-r--r--src/tests/elementary/elm_test_plug.c8
-rw-r--r--src/tests/elementary/elm_test_popup.c8
-rw-r--r--src/tests/elementary/elm_test_prefs.c8
-rw-r--r--src/tests/elementary/elm_test_progressbar.c8
-rw-r--r--src/tests/elementary/elm_test_radio.c8
-rw-r--r--src/tests/elementary/elm_test_scroller.c8
-rw-r--r--src/tests/elementary/elm_test_segmentcontrol.c8
-rw-r--r--src/tests/elementary/elm_test_separator.c8
-rw-r--r--src/tests/elementary/elm_test_slider.c8
-rw-r--r--src/tests/elementary/elm_test_slideshow.c8
-rw-r--r--src/tests/elementary/elm_test_spinner.c8
-rw-r--r--src/tests/elementary/elm_test_table.c8
-rw-r--r--src/tests/elementary/elm_test_thumb.c8
-rw-r--r--src/tests/elementary/elm_test_toolbar.c8
-rw-r--r--src/tests/elementary/elm_test_video.c8
-rw-r--r--src/tests/elementary/elm_test_web.c8
-rw-r--r--src/tests/elementary/elm_test_win.c28
-rw-r--r--src/tests/elocation/elocation_suite.c28
-rw-r--r--src/tests/elput/elput_suite.h2
-rw-r--r--src/tests/elput/elput_test_elput.c4
-rw-r--r--src/tests/elua/elua_lib.c4
-rw-r--r--src/tests/elua/elua_suite.h2
-rw-r--r--src/tests/emile/emile_suite.h2
-rw-r--r--src/tests/emile/emile_test_base.c4
-rw-r--r--src/tests/emile/emile_test_base64.c8
-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
-rw-r--r--src/tests/eo_cxx/eo_cxx_suite.h2
-rw-r--r--src/tests/eolian/eolian_generation.c36
-rw-r--r--src/tests/eolian/eolian_parsing.c88
-rw-r--r--src/tests/eolian/eolian_suite.h2
-rw-r--r--src/tests/eolian_cxx/eolian_cxx_suite.h2
-rw-r--r--src/tests/evas/evas_suite.h2
-rw-r--r--src/tests/evas/evas_test_callbacks.c8
-rw-r--r--src/tests/evas/evas_test_evasgl.c8
-rw-r--r--src/tests/evas/evas_test_filters.c16
-rw-r--r--src/tests/evas/evas_test_image.c40
-rw-r--r--src/tests/evas/evas_test_init.c4
-rw-r--r--src/tests/evas/evas_test_mask.c12
-rw-r--r--src/tests/evas/evas_test_matrix.c4
-rw-r--r--src/tests/evas/evas_test_mesh.c4
-rw-r--r--src/tests/evas/evas_test_object.c4
-rw-r--r--src/tests/evas/evas_test_object_smart.c4
-rw-r--r--src/tests/evas/evas_test_render_engines.c8
-rw-r--r--src/tests/evas/evas_test_text.c40
-rw-r--r--src/tests/evas/evas_test_textblock.c88
-rw-r--r--src/tests/evil/evil_suite.h2
-rw-r--r--src/tests/evil/evil_test_dlfcn.c20
-rw-r--r--src/tests/evil/evil_test_libgen.c48
-rw-r--r--src/tests/evil/evil_test_main.c4
-rw-r--r--src/tests/evil/evil_test_stdio.c28
-rw-r--r--src/tests/evil/evil_test_stdlib.c68
-rw-r--r--src/tests/evil/evil_test_unistd.c4
256 files changed, 2278 insertions, 2197 deletions
diff --git a/src/tests/ecore/ecore_suite.h b/src/tests/ecore/ecore_suite.h
index 50df87f..43c4368 100644
--- a/src/tests/ecore/ecore_suite.h
+++ b/src/tests/ecore/ecore_suite.h
@@ -2,7 +2,7 @@
2#define _ECORE_SUITE_H 2#define _ECORE_SUITE_H
3 3
4#include <check.h> 4#include <check.h>
5 5#include "../efl_check.h"
6void ecore_test_ecore(TCase *tc); 6void ecore_test_ecore(TCase *tc);
7void ecore_test_ecore_x(TCase *tc); 7void ecore_test_ecore_x(TCase *tc);
8void ecore_test_ecore_imf(TCase *tc); 8void ecore_test_ecore_imf(TCase *tc);
diff --git a/src/tests/ecore/ecore_test_animator.c b/src/tests/ecore/ecore_test_animator.c
index 172d770..1ec956a 100644
--- a/src/tests/ecore/ecore_test_animator.c
+++ b/src/tests/ecore/ecore_test_animator.c
@@ -21,7 +21,7 @@ static Eina_Bool _anim_cb(void *data EINA_UNUSED, double pos)
21 return EINA_TRUE; 21 return EINA_TRUE;
22} 22}
23 23
24START_TEST(ecore_test_animators) 24EFL_START_TEST(ecore_test_animators)
25{ 25{
26 Ecore_Animator *animator; 26 Ecore_Animator *animator;
27 double interval1 = 0.02; 27 double interval1 = 0.02;
@@ -46,7 +46,7 @@ START_TEST(ecore_test_animators)
46 ecore_shutdown(); 46 ecore_shutdown();
47 47
48} 48}
49END_TEST 49EFL_END_TEST
50 50
51Eina_Bool test_pos(Ecore_Pos_Map posmap, double v1, double v2, double (*testmap)(double val, double v1, double v2)) 51Eina_Bool test_pos(Ecore_Pos_Map posmap, double v1, double v2, double (*testmap)(double val, double v1, double v2))
52{ 52{
@@ -88,14 +88,14 @@ double _sinusoidal(double val, double v1 EINA_UNUSED, double v2 EINA_UNUSED)
88 return (1 - cos(val * M_PI)) / 2; 88 return (1 - cos(val * M_PI)) / 2;
89} 89}
90 90
91START_TEST(ecore_test_pos_map) 91EFL_START_TEST(ecore_test_pos_map)
92{ 92{
93 fail_if(!test_pos(ECORE_POS_MAP_LINEAR, 0, 0, _linear)); 93 fail_if(!test_pos(ECORE_POS_MAP_LINEAR, 0, 0, _linear));
94 fail_if(!test_pos(ECORE_POS_MAP_ACCELERATE, 0, 0, _accel)); 94 fail_if(!test_pos(ECORE_POS_MAP_ACCELERATE, 0, 0, _accel));
95 fail_if(!test_pos(ECORE_POS_MAP_DECELERATE, 0, 0, _decel)); 95 fail_if(!test_pos(ECORE_POS_MAP_DECELERATE, 0, 0, _decel));
96 fail_if(!test_pos(ECORE_POS_MAP_SINUSOIDAL, 0, 0, _sinusoidal)); 96 fail_if(!test_pos(ECORE_POS_MAP_SINUSOIDAL, 0, 0, _sinusoidal));
97} 97}
98END_TEST 98EFL_END_TEST
99 99
100static void _animator_called_cb(void *data) 100static void _animator_called_cb(void *data)
101{ 101{
@@ -124,7 +124,7 @@ static Eina_Bool _quit_cb(void* data EINA_UNUSED)
124 return ECORE_CALLBACK_CANCEL; 124 return ECORE_CALLBACK_CANCEL;
125} 125}
126 126
127START_TEST(ecore_test_begin_end_tick) 127EFL_START_TEST(ecore_test_begin_end_tick)
128{ 128{
129 Ecore_Timer *timer1, *timer2; 129 Ecore_Timer *timer1, *timer2;
130 Ecore_Animator *animator; 130 Ecore_Animator *animator;
@@ -156,7 +156,7 @@ START_TEST(ecore_test_begin_end_tick)
156 156
157 ecore_shutdown(); 157 ecore_shutdown();
158} 158}
159END_TEST 159EFL_END_TEST
160 160
161void ecore_test_animator(TCase *tc) 161void ecore_test_animator(TCase *tc)
162{ 162{
diff --git a/src/tests/ecore/ecore_test_args.c b/src/tests/ecore/ecore_test_args.c
index 36bb7d8..75a9b7d 100644
--- a/src/tests/ecore/ecore_test_args.c
+++ b/src/tests/ecore/ecore_test_args.c
@@ -24,7 +24,7 @@ _cb_args1(void *data EINA_UNUSED, const Efl_Event *event)
24 ecore_main_loop_quit(); 24 ecore_main_loop_quit();
25} 25}
26 26
27START_TEST(ecore_test_args1) 27EFL_START_TEST(ecore_test_args1)
28{ 28{
29 ecore_init(); 29 ecore_init();
30 efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, 30 efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
@@ -33,7 +33,7 @@ START_TEST(ecore_test_args1)
33 ecore_main_loop_begin(); 33 ecore_main_loop_begin();
34 ecore_shutdown(); 34 ecore_shutdown();
35} 35}
36END_TEST 36EFL_END_TEST
37 37
38static void 38static void
39_cb_args2(void *data EINA_UNUSED, const Efl_Event *event) 39_cb_args2(void *data EINA_UNUSED, const Efl_Event *event)
@@ -45,7 +45,7 @@ _cb_args2(void *data EINA_UNUSED, const Efl_Event *event)
45 ecore_main_loop_quit(); 45 ecore_main_loop_quit();
46} 46}
47 47
48START_TEST(ecore_test_args2) 48EFL_START_TEST(ecore_test_args2)
49{ 49{
50 const char *simple_args[] = { 50 const char *simple_args[] = {
51 "hello world" 51 "hello world"
@@ -58,7 +58,7 @@ START_TEST(ecore_test_args2)
58 ecore_main_loop_begin(); 58 ecore_main_loop_begin();
59 ecore_shutdown(); 59 ecore_shutdown();
60} 60}
61END_TEST 61EFL_END_TEST
62 62
63static void 63static void
64_cb_args3(void *data EINA_UNUSED, const Efl_Event *event) 64_cb_args3(void *data EINA_UNUSED, const Efl_Event *event)
@@ -69,7 +69,7 @@ _cb_args3(void *data EINA_UNUSED, const Efl_Event *event)
69 ecore_main_loop_quit(); 69 ecore_main_loop_quit();
70} 70}
71 71
72START_TEST(ecore_test_args3) 72EFL_START_TEST(ecore_test_args3)
73{ 73{
74 ecore_init(); 74 ecore_init();
75 efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS, 75 efl_event_callback_add(efl_main_loop_get(), EFL_LOOP_EVENT_ARGUMENTS,
@@ -78,7 +78,7 @@ START_TEST(ecore_test_args3)
78 ecore_main_loop_begin(); 78 ecore_main_loop_begin();
79 ecore_shutdown(); 79 ecore_shutdown();
80} 80}
81END_TEST 81EFL_END_TEST
82 82
83void ecore_test_ecore_args(TCase *tc) 83void ecore_test_ecore_args(TCase *tc)
84{ 84{
diff --git a/src/tests/ecore/ecore_test_ecore.c b/src/tests/ecore/ecore_test_ecore.c
index fd31285..acce1cc 100644
--- a/src/tests/ecore/ecore_test_ecore.c
+++ b/src/tests/ecore/ecore_test_ecore.c
@@ -31,7 +31,7 @@ _dummy_cb(void *data)
31 return !!data; 31 return !!data;
32} 32}
33 33
34START_TEST(ecore_test_ecore_init) 34EFL_START_TEST(ecore_test_ecore_init)
35{ 35{
36 int ret; 36 int ret;
37 37
@@ -41,9 +41,9 @@ START_TEST(ecore_test_ecore_init)
41 ret = ecore_shutdown(); 41 ret = ecore_shutdown();
42 fail_if(ret != 0); 42 fail_if(ret != 0);
43} 43}
44END_TEST 44EFL_END_TEST
45 45
46START_TEST(ecore_test_ecore_main_loop) 46EFL_START_TEST(ecore_test_ecore_main_loop)
47{ 47{
48 Eina_Bool did = EINA_FALSE; 48 Eina_Bool did = EINA_FALSE;
49 Ecore_Timer *timer; 49 Ecore_Timer *timer;
@@ -61,9 +61,9 @@ START_TEST(ecore_test_ecore_main_loop)
61 61
62 ret = ecore_shutdown(); 62 ret = ecore_shutdown();
63} 63}
64END_TEST 64EFL_END_TEST
65 65
66START_TEST(ecore_test_ecore_main_loop_idler) 66EFL_START_TEST(ecore_test_ecore_main_loop_idler)
67{ 67{
68 Eina_Bool did = EINA_FALSE; 68 Eina_Bool did = EINA_FALSE;
69 Ecore_Idler *idler; 69 Ecore_Idler *idler;
@@ -81,9 +81,9 @@ START_TEST(ecore_test_ecore_main_loop_idler)
81 81
82 ret = ecore_shutdown(); 82 ret = ecore_shutdown();
83} 83}
84END_TEST 84EFL_END_TEST
85 85
86START_TEST(ecore_test_ecore_main_loop_idle_enterer) 86EFL_START_TEST(ecore_test_ecore_main_loop_idle_enterer)
87{ 87{
88 Eina_Bool did = EINA_FALSE; 88 Eina_Bool did = EINA_FALSE;
89 Ecore_Idle_Enterer *idle_enterer; 89 Ecore_Idle_Enterer *idle_enterer;
@@ -101,9 +101,9 @@ START_TEST(ecore_test_ecore_main_loop_idle_enterer)
101 101
102 ret = ecore_shutdown(); 102 ret = ecore_shutdown();
103} 103}
104END_TEST 104EFL_END_TEST
105 105
106START_TEST(ecore_test_ecore_main_loop_idle_before_enterer) 106EFL_START_TEST(ecore_test_ecore_main_loop_idle_before_enterer)
107{ 107{
108 Eina_Bool did = EINA_FALSE; 108 Eina_Bool did = EINA_FALSE;
109 Ecore_Idle_Enterer *idle_enterer; 109 Ecore_Idle_Enterer *idle_enterer;
@@ -121,9 +121,9 @@ START_TEST(ecore_test_ecore_main_loop_idle_before_enterer)
121 121
122 ret = ecore_shutdown(); 122 ret = ecore_shutdown();
123} 123}
124END_TEST 124EFL_END_TEST
125 125
126START_TEST(ecore_test_ecore_main_loop_idle_exiter) 126EFL_START_TEST(ecore_test_ecore_main_loop_idle_exiter)
127{ 127{
128 Eina_Bool did = EINA_FALSE; 128 Eina_Bool did = EINA_FALSE;
129 Ecore_Timer *timer; 129 Ecore_Timer *timer;
@@ -146,9 +146,9 @@ START_TEST(ecore_test_ecore_main_loop_idle_exiter)
146 146
147 ret = ecore_shutdown(); 147 ret = ecore_shutdown();
148} 148}
149END_TEST 149EFL_END_TEST
150 150
151START_TEST(ecore_test_ecore_main_loop_timer) 151EFL_START_TEST(ecore_test_ecore_main_loop_timer)
152{ 152{
153 Eina_Bool did = EINA_FALSE; 153 Eina_Bool did = EINA_FALSE;
154 Ecore_Timer *timer; 154 Ecore_Timer *timer;
@@ -172,7 +172,7 @@ START_TEST(ecore_test_ecore_main_loop_timer)
172 172
173 ret = ecore_shutdown(); 173 ret = ecore_shutdown();
174} 174}
175END_TEST 175EFL_END_TEST
176 176
177// Disabled tests: inner main loops are not supposed to work! 177// Disabled tests: inner main loops are not supposed to work!
178#if 0 178#if 0
@@ -204,7 +204,7 @@ static Eina_Bool _timer1(void *data)
204 return EINA_FALSE; 204 return EINA_FALSE;
205} 205}
206 206
207START_TEST(ecore_test_ecore_main_loop_timer_inner) 207EFL_START_TEST(ecore_test_ecore_main_loop_timer_inner)
208{ 208{
209 Ecore_Timer *timer; 209 Ecore_Timer *timer;
210 int ret; 210 int ret;
@@ -224,7 +224,7 @@ START_TEST(ecore_test_ecore_main_loop_timer_inner)
224 224
225 ecore_shutdown(); 225 ecore_shutdown();
226} 226}
227END_TEST 227EFL_END_TEST
228#endif 228#endif
229 229
230static Eina_Bool 230static Eina_Bool
@@ -238,7 +238,7 @@ _fd_handler_cb(void *data, Ecore_Fd_Handler *handler EINA_UNUSED)
238 return EINA_FALSE; 238 return EINA_FALSE;
239} 239}
240 240
241START_TEST(ecore_test_ecore_main_loop_fd_handler) 241EFL_START_TEST(ecore_test_ecore_main_loop_fd_handler)
242{ 242{
243 Eina_Bool did = EINA_FALSE; 243 Eina_Bool did = EINA_FALSE;
244 Ecore_Fd_Handler *fd_handler; 244 Ecore_Fd_Handler *fd_handler;
@@ -267,9 +267,9 @@ START_TEST(ecore_test_ecore_main_loop_fd_handler)
267 267
268 ret = ecore_shutdown(); 268 ret = ecore_shutdown();
269} 269}
270END_TEST 270EFL_END_TEST
271 271
272START_TEST(ecore_test_ecore_main_loop_fd_handler_valid_flags) 272EFL_START_TEST(ecore_test_ecore_main_loop_fd_handler_valid_flags)
273{ 273{
274 Ecore_Fd_Handler *fd_handler; 274 Ecore_Fd_Handler *fd_handler;
275 int comm[2]; 275 int comm[2];
@@ -293,7 +293,7 @@ START_TEST(ecore_test_ecore_main_loop_fd_handler_valid_flags)
293 293
294 ecore_shutdown(); 294 ecore_shutdown();
295} 295}
296END_TEST 296EFL_END_TEST
297 297
298static void 298static void
299_eo_read_cb(void *data, const Efl_Event *info EINA_UNUSED) 299_eo_read_cb(void *data, const Efl_Event *info EINA_UNUSED)
@@ -304,7 +304,7 @@ _eo_read_cb(void *data, const Efl_Event *info EINA_UNUSED)
304 ecore_main_loop_quit(); 304 ecore_main_loop_quit();
305} 305}
306 306
307START_TEST(ecore_test_efl_loop_fd) 307EFL_START_TEST(ecore_test_efl_loop_fd)
308{ 308{
309 Eina_Bool did = EINA_FALSE; 309 Eina_Bool did = EINA_FALSE;
310 Eo *fd; 310 Eo *fd;
@@ -334,7 +334,7 @@ START_TEST(ecore_test_efl_loop_fd)
334 334
335 ret = ecore_shutdown(); 335 ret = ecore_shutdown();
336} 336}
337END_TEST 337EFL_END_TEST
338 338
339static void 339static void
340_efl_del_cb(void *data, const Efl_Event *ev EINA_UNUSED) 340_efl_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
@@ -344,7 +344,7 @@ _efl_del_cb(void *data, const Efl_Event *ev EINA_UNUSED)
344 *dead = EINA_TRUE; 344 *dead = EINA_TRUE;
345} 345}
346 346
347START_TEST(ecore_test_efl_loop_fd_lifecycle) 347EFL_START_TEST(ecore_test_efl_loop_fd_lifecycle)
348{ 348{
349 Eina_Bool did = EINA_FALSE; 349 Eina_Bool did = EINA_FALSE;
350 Eina_Bool dead = EINA_FALSE; 350 Eina_Bool dead = EINA_FALSE;
@@ -385,9 +385,9 @@ START_TEST(ecore_test_efl_loop_fd_lifecycle)
385 385
386 efl_object_shutdown(); 386 efl_object_shutdown();
387} 387}
388END_TEST 388EFL_END_TEST
389 389
390START_TEST(ecore_test_ecore_main_loop_fd_handler_activate_modify) 390EFL_START_TEST(ecore_test_ecore_main_loop_fd_handler_activate_modify)
391{ 391{
392 Eina_Bool did = EINA_FALSE; 392 Eina_Bool did = EINA_FALSE;
393 Ecore_Fd_Handler *fd_handler; 393 Ecore_Fd_Handler *fd_handler;
@@ -418,7 +418,7 @@ START_TEST(ecore_test_ecore_main_loop_fd_handler_activate_modify)
418 418
419 ret = ecore_shutdown(); 419 ret = ecore_shutdown();
420} 420}
421END_TEST 421EFL_END_TEST
422 422
423static Eina_Bool 423static Eina_Bool
424_event_handler_cb(void *data, int type, void *event) 424_event_handler_cb(void *data, int type, void *event)
@@ -526,7 +526,7 @@ _filter_end(void *user_data, void *func_data EINA_UNUSED)
526 (*fdid)++; 526 (*fdid)++;
527} 527}
528 528
529START_TEST(ecore_test_ecore_main_loop_event) 529EFL_START_TEST(ecore_test_ecore_main_loop_event)
530{ 530{
531 Ecore_Event_Handler *handler, *handler2, *handler3; 531 Ecore_Event_Handler *handler, *handler2, *handler3;
532 Ecore_Event_Filter *filter_handler; 532 Ecore_Event_Filter *filter_handler;
@@ -630,7 +630,7 @@ START_TEST(ecore_test_ecore_main_loop_event)
630 630
631 res_counter = ecore_shutdown(); 631 res_counter = ecore_shutdown();
632} 632}
633END_TEST 633EFL_END_TEST
634 634
635#if 0 635#if 0
636static int _log_dom; 636static int _log_dom;
@@ -670,7 +670,7 @@ _event_recursive_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EI
670 return EINA_FALSE; 670 return EINA_FALSE;
671} 671}
672 672
673START_TEST(ecore_test_ecore_main_loop_event_recursive) 673EFL_START_TEST(ecore_test_ecore_main_loop_event_recursive)
674{ 674{
675 /* This test tests if the event handlers are really called only once when 675 /* This test tests if the event handlers are really called only once when
676 * recursive main loops are used and any number of events may have occurred 676 * recursive main loops are used and any number of events may have occurred
@@ -698,10 +698,10 @@ START_TEST(ecore_test_ecore_main_loop_event_recursive)
698 INF("main: end"); 698 INF("main: end");
699 ecore_shutdown(); 699 ecore_shutdown();
700} 700}
701END_TEST 701EFL_END_TEST
702#endif 702#endif
703 703
704START_TEST(ecore_test_ecore_app) 704EFL_START_TEST(ecore_test_ecore_app)
705{ 705{
706 int ret; 706 int ret;
707 707
@@ -726,7 +726,7 @@ START_TEST(ecore_test_ecore_app)
726 726
727 ret = ecore_shutdown(); 727 ret = ecore_shutdown();
728} 728}
729END_TEST 729EFL_END_TEST
730 730
731Eina_Bool _poller_cb(void *data) 731Eina_Bool _poller_cb(void *data)
732{ 732{
@@ -735,7 +735,7 @@ Eina_Bool _poller_cb(void *data)
735 return ECORE_CALLBACK_RENEW; 735 return ECORE_CALLBACK_RENEW;
736} 736}
737 737
738START_TEST(ecore_test_ecore_main_loop_poller) 738EFL_START_TEST(ecore_test_ecore_main_loop_poller)
739{ 739{
740 int ret; 740 int ret;
741 741
@@ -791,7 +791,7 @@ START_TEST(ecore_test_ecore_main_loop_poller)
791 791
792 ret = ecore_shutdown(); 792 ret = ecore_shutdown();
793} 793}
794END_TEST 794EFL_END_TEST
795 795
796Eina_Bool _poller_handler(void *data) 796Eina_Bool _poller_handler(void *data)
797{ 797{
@@ -826,7 +826,7 @@ Eina_Bool _poller_loop(void *data)
826 return ECORE_CALLBACK_RENEW; 826 return ECORE_CALLBACK_RENEW;
827} 827}
828 828
829START_TEST(ecore_test_ecore_main_loop_poller_add_del) 829EFL_START_TEST(ecore_test_ecore_main_loop_poller_add_del)
830{ 830{
831 int ret, count_res = 0; 831 int ret, count_res = 0;
832 832
@@ -855,7 +855,7 @@ START_TEST(ecore_test_ecore_main_loop_poller_add_del)
855 855
856 ret = ecore_shutdown(); 856 ret = ecore_shutdown();
857} 857}
858END_TEST 858EFL_END_TEST
859 859
860void ecore_test_ecore(TCase *tc) 860void ecore_test_ecore(TCase *tc)
861{ 861{
diff --git a/src/tests/ecore/ecore_test_ecore_audio.c b/src/tests/ecore/ecore_test_ecore_audio.c
index 7969be0..6447e91 100644
--- a/src/tests/ecore/ecore_test_ecore_audio.c
+++ b/src/tests/ecore/ecore_test_ecore_audio.c
@@ -51,7 +51,7 @@ _seek_vol(void *data)
51 return EINA_FALSE; 51 return EINA_FALSE;
52} 52}
53 53
54START_TEST(ecore_test_ecore_audio_obj_pulse) 54EFL_START_TEST(ecore_test_ecore_audio_obj_pulse)
55{ 55{
56 Eo *in, *out; 56 Eo *in, *out;
57 Eina_Bool ret = EINA_FALSE; 57 Eina_Bool ret = EINA_FALSE;
@@ -81,7 +81,7 @@ START_TEST(ecore_test_ecore_audio_obj_pulse)
81 efl_del(out); 81 efl_del(out);
82 efl_del(in); 82 efl_del(in);
83} 83}
84END_TEST 84EFL_END_TEST
85#endif 85#endif
86#endif 86#endif
87 87
@@ -102,7 +102,7 @@ _idle_del(void *data)
102 return EINA_FALSE; 102 return EINA_FALSE;
103} 103}
104 104
105START_TEST(ecore_test_ecore_audio_cleanup) 105EFL_START_TEST(ecore_test_ecore_audio_cleanup)
106{ 106{
107 Eo *in, *out; 107 Eo *in, *out;
108 int freq = 1000; 108 int freq = 1000;
@@ -130,9 +130,9 @@ START_TEST(ecore_test_ecore_audio_cleanup)
130 130
131 ecore_file_remove(TESTS_BUILD_DIR"/tmp.ogg"); 131 ecore_file_remove(TESTS_BUILD_DIR"/tmp.ogg");
132} 132}
133END_TEST 133EFL_END_TEST
134 134
135START_TEST(ecore_test_ecore_audio_obj_tone) 135EFL_START_TEST(ecore_test_ecore_audio_obj_tone)
136{ 136{
137 Eo *in, *out; 137 Eo *in, *out;
138 double len; 138 double len;
@@ -221,9 +221,9 @@ START_TEST(ecore_test_ecore_audio_obj_tone)
221 //TODO: Compare and fail 221 //TODO: Compare and fail
222 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav"); 222 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav");
223} 223}
224END_TEST 224EFL_END_TEST
225 225
226START_TEST(ecore_test_ecore_audio_obj_sndfile) 226EFL_START_TEST(ecore_test_ecore_audio_obj_sndfile)
227{ 227{
228 Eo *in, *out; 228 Eo *in, *out;
229 double len, rem; 229 double len, rem;
@@ -311,9 +311,9 @@ START_TEST(ecore_test_ecore_audio_obj_sndfile)
311 //TODO: Compare and fail 311 //TODO: Compare and fail
312 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav"); 312 ecore_file_remove(TESTS_BUILD_DIR"/tmp.wav");
313} 313}
314END_TEST 314EFL_END_TEST
315 315
316START_TEST(ecore_test_ecore_audio_obj_in_out) 316EFL_START_TEST(ecore_test_ecore_audio_obj_in_out)
317{ 317{
318 Eo *out2; 318 Eo *out2;
319 Eina_List *in3; 319 Eina_List *in3;
@@ -373,7 +373,7 @@ START_TEST(ecore_test_ecore_audio_obj_in_out)
373 373
374 efl_del(in); 374 efl_del(in);
375} 375}
376END_TEST 376EFL_END_TEST
377 377
378static int read_cb(void *data EINA_UNUSED, Eo *eo_obj EINA_UNUSED, void *buffer, int len) 378static int read_cb(void *data EINA_UNUSED, Eo *eo_obj EINA_UNUSED, void *buffer, int len)
379{ 379{
@@ -413,7 +413,7 @@ Ecore_Audio_Vio out_vio = {
413 .write = write_cb, 413 .write = write_cb,
414}; 414};
415 415
416START_TEST(ecore_test_ecore_audio_obj_vio) 416EFL_START_TEST(ecore_test_ecore_audio_obj_vio)
417{ 417{
418 Eo *in, *out; 418 Eo *in, *out;
419 419
@@ -433,7 +433,7 @@ START_TEST(ecore_test_ecore_audio_obj_vio)
433 efl_del(out); 433 efl_del(out);
434 efl_del(in); 434 efl_del(in);
435} 435}
436END_TEST 436EFL_END_TEST
437 437
438static void _myfree(void *data) 438static void _myfree(void *data)
439{ 439{
@@ -442,7 +442,7 @@ static void _myfree(void *data)
442 *freed = EINA_TRUE; 442 *freed = EINA_TRUE;
443} 443}
444 444
445START_TEST(ecore_test_ecore_audio_obj_in) 445EFL_START_TEST(ecore_test_ecore_audio_obj_in)
446{ 446{
447 int i; 447 int i;
448 double speed, length; 448 double speed, length;
@@ -532,9 +532,9 @@ START_TEST(ecore_test_ecore_audio_obj_in)
532 532
533 efl_del(in); 533 efl_del(in);
534} 534}
535END_TEST 535EFL_END_TEST
536 536
537START_TEST(ecore_test_ecore_audio_obj) 537EFL_START_TEST(ecore_test_ecore_audio_obj)
538{ 538{
539 int i; 539 int i;
540 const char *name; 540 const char *name;
@@ -582,9 +582,9 @@ START_TEST(ecore_test_ecore_audio_obj)
582 } 582 }
583 583
584} 584}
585END_TEST 585EFL_END_TEST
586 586
587START_TEST(ecore_test_ecore_audio_init) 587EFL_START_TEST(ecore_test_ecore_audio_init)
588{ 588{
589 int ret; 589 int ret;
590 590
@@ -595,7 +595,7 @@ START_TEST(ecore_test_ecore_audio_init)
595 ck_assert_int_eq(ret, 1); 595 ck_assert_int_eq(ret, 1);
596 596
597} 597}
598END_TEST 598EFL_END_TEST
599 599
600void setup(void) 600void setup(void)
601{ 601{
diff --git a/src/tests/ecore/ecore_test_ecore_drm.c b/src/tests/ecore/ecore_test_ecore_drm.c
index ac02f26..12a863f 100644
--- a/src/tests/ecore/ecore_test_ecore_drm.c
+++ b/src/tests/ecore/ecore_test_ecore_drm.c
@@ -11,7 +11,7 @@
11 11
12#define MAX_ITER 10 12#define MAX_ITER 10
13 13
14START_TEST(ecore_test_ecore_drm_shutdown_bef_init) 14EFL_START_TEST(ecore_test_ecore_drm_shutdown_bef_init)
15{ 15{
16 int ret = 0; 16 int ret = 0;
17 17
@@ -27,9 +27,9 @@ START_TEST(ecore_test_ecore_drm_shutdown_bef_init)
27 fprintf(stderr, "Calling ecore_drm_shutdown after ecore_drm_init.\n"); 27 fprintf(stderr, "Calling ecore_drm_shutdown after ecore_drm_init.\n");
28 fail_if(ret != 0); 28 fail_if(ret != 0);
29} 29}
30END_TEST 30EFL_END_TEST
31 31
32START_TEST(ecore_test_ecore_drm_init) 32EFL_START_TEST(ecore_test_ecore_drm_init)
33{ 33{
34 int ret, i, j; 34 int ret, i, j;
35 35
@@ -47,7 +47,7 @@ START_TEST(ecore_test_ecore_drm_init)
47 fail_if(ret != j); 47 fail_if(ret != j);
48 } 48 }
49} 49}
50END_TEST 50EFL_END_TEST
51 51
52void ecore_test_ecore_drm(TCase *tc) 52void ecore_test_ecore_drm(TCase *tc)
53{ 53{
diff --git a/src/tests/ecore/ecore_test_ecore_evas.c b/src/tests/ecore/ecore_test_ecore_evas.c
index a9e97c0..2e53f62 100644
--- a/src/tests/ecore/ecore_test_ecore_evas.c
+++ b/src/tests/ecore/ecore_test_ecore_evas.c
@@ -9,7 +9,7 @@
9#define WINDOW_HEIGHT 200 9#define WINDOW_HEIGHT 200
10#define WINDOW_WIDTH 200 10#define WINDOW_WIDTH 200
11 11
12START_TEST(ecore_test_ecore_evas_associate) 12EFL_START_TEST(ecore_test_ecore_evas_associate)
13{ 13{
14 Ecore_Evas *ee; 14 Ecore_Evas *ee;
15 Evas *canvas; 15 Evas *canvas;
@@ -34,9 +34,9 @@ START_TEST(ecore_test_ecore_evas_associate)
34 ret = ecore_evas_shutdown(); 34 ret = ecore_evas_shutdown();
35 fail_if(ret != 0); 35 fail_if(ret != 0);
36} 36}
37END_TEST 37EFL_END_TEST
38 38
39START_TEST(ecore_test_ecore_evas_cocoa) 39EFL_START_TEST(ecore_test_ecore_evas_cocoa)
40{ 40{
41 int ret; 41 int ret;
42 Ecore_Evas *ee; 42 Ecore_Evas *ee;
@@ -68,7 +68,7 @@ START_TEST(ecore_test_ecore_evas_cocoa)
68 ret = ecore_evas_shutdown(); 68 ret = ecore_evas_shutdown();
69 fail_if(ret != 0); 69 fail_if(ret != 0);
70} 70}
71END_TEST 71EFL_END_TEST
72 72
73void ecore_test_ecore_evas(TCase *tc) 73void ecore_test_ecore_evas(TCase *tc)
74{ 74{
diff --git a/src/tests/ecore/ecore_test_ecore_fb.c b/src/tests/ecore/ecore_test_ecore_fb.c
index ee5bbb1..f639dfe 100644
--- a/src/tests/ecore/ecore_test_ecore_fb.c
+++ b/src/tests/ecore/ecore_test_ecore_fb.c
@@ -11,7 +11,7 @@
11 11
12#define MAX_ITER 10 12#define MAX_ITER 10
13 13
14START_TEST(ecore_test_ecore_fb_init) 14EFL_START_TEST(ecore_test_ecore_fb_init)
15{ 15{
16// SKIP fb test as all it tests is init and shutdown and nothing else 16// SKIP fb test as all it tests is init and shutdown and nothing else
17// and these require basically a linux box with root or special 17// and these require basically a linux box with root or special
@@ -36,7 +36,7 @@ START_TEST(ecore_test_ecore_fb_init)
36 } 36 }
37 */ 37 */
38} 38}
39END_TEST 39EFL_END_TEST
40 40
41void ecore_test_ecore_fb(TCase *tc) 41void ecore_test_ecore_fb(TCase *tc)
42{ 42{
diff --git a/src/tests/ecore/ecore_test_ecore_file.c b/src/tests/ecore/ecore_test_ecore_file.c
index 343d52c..9ec21a1 100644
--- a/src/tests/ecore/ecore_test_ecore_file.c
+++ b/src/tests/ecore/ecore_test_ecore_file.c
@@ -115,7 +115,7 @@ progress_cb(void *data EINA_UNUSED, const char *file EINA_UNUSED,
115 return ECORE_FILE_PROGRESS_CONTINUE; 115 return ECORE_FILE_PROGRESS_CONTINUE;
116} 116}
117 117
118START_TEST(ecore_test_ecore_file_init) 118EFL_START_TEST(ecore_test_ecore_file_init)
119{ 119{
120 int ret; 120 int ret;
121 121
@@ -125,9 +125,9 @@ START_TEST(ecore_test_ecore_file_init)
125 ret = ecore_file_shutdown(); 125 ret = ecore_file_shutdown();
126 fail_if(ret != 0); 126 fail_if(ret != 0);
127} 127}
128END_TEST 128EFL_END_TEST
129 129
130START_TEST(ecore_test_ecore_file_operations) 130EFL_START_TEST(ecore_test_ecore_file_operations)
131{ 131{
132 const char* dirs[] = {"b", "b/c", "b/c/d", "d", 0}; 132 const char* dirs[] = {"b", "b/c", "b/c/d", "d", 0};
133 char *dirs2[] = {"a2", "b2", "c2", 0}; 133 char *dirs2[] = {"a2", "b2", "c2", 0};
@@ -355,9 +355,9 @@ START_TEST(ecore_test_ecore_file_operations)
355 fail_if(ret != 0); 355 fail_if(ret != 0);
356 356
357} 357}
358END_TEST 358EFL_END_TEST
359 359
360START_TEST(ecore_test_ecore_file_path) 360EFL_START_TEST(ecore_test_ecore_file_path)
361{ 361{
362 const char *src_dir, *src_file, *dest_file; 362 const char *src_dir, *src_file, *dest_file;
363 char *dup_dir, *path; 363 char *dup_dir, *path;
@@ -418,9 +418,9 @@ START_TEST(ecore_test_ecore_file_path)
418 ret = ecore_file_shutdown(); 418 ret = ecore_file_shutdown();
419 fail_if(ret != 0); 419 fail_if(ret != 0);
420} 420}
421END_TEST 421EFL_END_TEST
422 422
423START_TEST(ecore_test_ecore_file_monitor) 423EFL_START_TEST(ecore_test_ecore_file_monitor)
424{ 424{
425 Ecore_File_Monitor *mon; 425 Ecore_File_Monitor *mon;
426 const char *src_dir; 426 const char *src_dir;
@@ -473,9 +473,9 @@ START_TEST(ecore_test_ecore_file_monitor)
473 fail_if(ret != 0); 473 fail_if(ret != 0);
474 474
475} 475}
476END_TEST 476EFL_END_TEST
477 477
478START_TEST(ecore_test_ecore_file_download) 478EFL_START_TEST(ecore_test_ecore_file_download)
479{ 479{
480 const char *download_dir; 480 const char *download_dir;
481 const char *download_file; 481 const char *download_file;
@@ -538,7 +538,7 @@ START_TEST(ecore_test_ecore_file_download)
538 ret = ecore_file_shutdown(); 538 ret = ecore_file_shutdown();
539 fail_if(ret != 0); 539 fail_if(ret != 0);
540} 540}
541END_TEST 541EFL_END_TEST
542 542
543void ecore_test_ecore_file(TCase *tc) 543void ecore_test_ecore_file(TCase *tc)
544{ 544{
diff --git a/src/tests/ecore/ecore_test_ecore_imf.c b/src/tests/ecore/ecore_test_ecore_imf.c
index 8bd0173..3a1136b 100644
--- a/src/tests/ecore/ecore_test_ecore_imf.c
+++ b/src/tests/ecore/ecore_test_ecore_imf.c
@@ -6,12 +6,12 @@
6 6
7#include "ecore_suite.h" 7#include "ecore_suite.h"
8 8
9START_TEST(ecore_test_ecore_imf_init) 9EFL_START_TEST(ecore_test_ecore_imf_init)
10{ 10{
11 ecore_imf_init(); 11 ecore_imf_init();
12 ecore_imf_shutdown(); 12 ecore_imf_shutdown();
13} 13}
14END_TEST 14EFL_END_TEST
15 15
16static const char *built_modules[] = { 16static const char *built_modules[] = {
17#ifdef ENABLE_XIM 17#ifdef ENABLE_XIM
@@ -42,7 +42,7 @@ _find_list(const Eina_List *lst, const char *item)
42 return EINA_FALSE; 42 return EINA_FALSE;
43} 43}
44 44
45START_TEST(ecore_test_ecore_imf_modules) 45EFL_START_TEST(ecore_test_ecore_imf_modules)
46{ 46{
47 Eina_List *modules; 47 Eina_List *modules;
48 const char **itr; 48 const char **itr;
@@ -61,9 +61,9 @@ START_TEST(ecore_test_ecore_imf_modules)
61 eina_list_free(modules); 61 eina_list_free(modules);
62 ecore_imf_shutdown(); 62 ecore_imf_shutdown();
63} 63}
64END_TEST 64EFL_END_TEST
65 65
66START_TEST(ecore_test_ecore_imf_modules_load) 66EFL_START_TEST(ecore_test_ecore_imf_modules_load)
67{ 67{
68 const char **itr; 68 const char **itr;
69 69
@@ -78,7 +78,7 @@ START_TEST(ecore_test_ecore_imf_modules_load)
78 78
79 ecore_imf_shutdown(); 79 ecore_imf_shutdown();
80} 80}
81END_TEST 81EFL_END_TEST
82 82
83void ecore_test_ecore_imf(TCase *tc) 83void ecore_test_ecore_imf(TCase *tc)
84{ 84{
diff --git a/src/tests/ecore/ecore_test_ecore_input.c b/src/tests/ecore/ecore_test_ecore_input.c
index ccb0c92..f1905cb 100644
--- a/src/tests/ecore/ecore_test_ecore_input.c
+++ b/src/tests/ecore/ecore_test_ecore_input.c
@@ -11,7 +11,7 @@
11 11
12#define MAX_ITER 10 12#define MAX_ITER 10
13 13
14START_TEST(ecore_test_ecore_input_init) 14EFL_START_TEST(ecore_test_ecore_input_init)
15{ 15{
16 int ret, i, j; 16 int ret, i, j;
17 17
@@ -29,7 +29,7 @@ START_TEST(ecore_test_ecore_input_init)
29 fail_if(ret != j); 29 fail_if(ret != j);
30 } 30 }
31} 31}
32END_TEST 32EFL_END_TEST
33 33
34void ecore_test_ecore_input(TCase *tc) 34void ecore_test_ecore_input(TCase *tc)
35{ 35{
diff --git a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
index 70107b9..a787b97 100644
--- a/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
+++ b/src/tests/ecore/ecore_test_ecore_thread_eina_thread_queue.c
@@ -69,7 +69,7 @@ th2_do(void *data EINA_UNUSED, Ecore_Thread *th EINA_UNUSED)
69 } 69 }
70} 70}
71 71
72START_TEST(ecore_test_ecore_thread_eina_thread_queue_t1) 72EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t1)
73{ 73{
74 int val = 99; 74 int val = 99;
75 75
@@ -104,7 +104,7 @@ START_TEST(ecore_test_ecore_thread_eina_thread_queue_t1)
104 ecore_shutdown(); 104 ecore_shutdown();
105 eina_shutdown(); 105 eina_shutdown();
106} 106}
107END_TEST 107EFL_END_TEST
108 108
109///////////////////////////////////////////////////////////////////////////// 109/////////////////////////////////////////////////////////////////////////////
110typedef struct 110typedef struct
@@ -137,7 +137,7 @@ thspeed2_do(void *data EINA_UNUSED, Ecore_Thread *th EINA_UNUSED)
137 } 137 }
138} 138}
139 139
140START_TEST(ecore_test_ecore_thread_eina_thread_queue_t2) 140EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t2)
141{ 141{
142 Msg2 *msg; 142 Msg2 *msg;
143 void *ref; 143 void *ref;
@@ -169,7 +169,7 @@ START_TEST(ecore_test_ecore_thread_eina_thread_queue_t2)
169 ecore_shutdown(); 169 ecore_shutdown();
170 eina_shutdown(); 170 eina_shutdown();
171} 171}
172END_TEST 172EFL_END_TEST
173 173
174///////////////////////////////////////////////////////////////////////////// 174/////////////////////////////////////////////////////////////////////////////
175typedef struct 175typedef struct
@@ -216,7 +216,7 @@ th32_do(void *data EINA_UNUSED, Ecore_Thread *th EINA_UNUSED)
216 } 216 }
217} 217}
218 218
219START_TEST(ecore_test_ecore_thread_eina_thread_queue_t3) 219EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t3)
220{ 220{
221 int val1 = 99, val2 = 99, cnt = 0; 221 int val1 = 99, val2 = 99, cnt = 0;
222 Eina_Thread_Queue *parent; 222 Eina_Thread_Queue *parent;
@@ -285,7 +285,7 @@ START_TEST(ecore_test_ecore_thread_eina_thread_queue_t3)
285 ecore_shutdown(); 285 ecore_shutdown();
286 eina_shutdown(); 286 eina_shutdown();
287} 287}
288END_TEST 288EFL_END_TEST
289 289
290///////////////////////////////////////////////////////////////////////////// 290/////////////////////////////////////////////////////////////////////////////
291typedef struct 291typedef struct
@@ -331,7 +331,7 @@ th42_do(void *data EINA_UNUSED, Ecore_Thread *th EINA_UNUSED)
331} 331}
332 332
333 333
334START_TEST(ecore_test_ecore_thread_eina_thread_queue_t4) 334EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t4)
335{ 335{
336 int cnt = 0; 336 int cnt = 0;
337 int val1 = 99, val2 = 9999; 337 int val1 = 99, val2 = 9999;
@@ -375,7 +375,7 @@ START_TEST(ecore_test_ecore_thread_eina_thread_queue_t4)
375 ecore_shutdown(); 375 ecore_shutdown();
376 eina_shutdown(); 376 eina_shutdown();
377} 377}
378END_TEST 378EFL_END_TEST
379 379
380///////////////////////////////////////////////////////////////////////////// 380/////////////////////////////////////////////////////////////////////////////
381typedef struct 381typedef struct
@@ -435,7 +435,7 @@ th52_do(void *data EINA_UNUSED, Ecore_Thread *th EINA_UNUSED)
435} 435}
436 436
437 437
438START_TEST(ecore_test_ecore_thread_eina_thread_queue_t5) 438EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t5)
439{ 439{
440 int val = 99; 440 int val = 99;
441 441
@@ -484,7 +484,7 @@ START_TEST(ecore_test_ecore_thread_eina_thread_queue_t5)
484 484
485 ecore_shutdown(); 485 ecore_shutdown();
486} 486}
487END_TEST 487EFL_END_TEST
488 488
489///////////////////////////////////////////////////////////////////////////// 489/////////////////////////////////////////////////////////////////////////////
490typedef struct 490typedef struct
@@ -579,7 +579,7 @@ th63_do(void *data EINA_UNUSED, Ecore_Thread *th EINA_UNUSED)
579 if (DEBUG) printf("%s: message reading done!\n", __FUNCTION__); 579 if (DEBUG) printf("%s: message reading done!\n", __FUNCTION__);
580} 580}
581 581
582START_TEST(ecore_test_ecore_thread_eina_thread_queue_t6) 582EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t6)
583{ 583{
584 Ecore_Thread *t1, *t2, *t3; 584 Ecore_Thread *t1, *t2, *t3;
585 int do_break = 0; 585 int do_break = 0;
@@ -631,7 +631,7 @@ START_TEST(ecore_test_ecore_thread_eina_thread_queue_t6)
631 ecore_shutdown(); 631 ecore_shutdown();
632 eina_shutdown(); 632 eina_shutdown();
633} 633}
634END_TEST 634EFL_END_TEST
635 635
636///////////////////////////////////////////////////////////////////////////// 636/////////////////////////////////////////////////////////////////////////////
637typedef struct 637typedef struct
@@ -656,7 +656,7 @@ thspeed7_do(void *data EINA_UNUSED, Ecore_Thread *th EINA_UNUSED)
656 } 656 }
657} 657}
658 658
659START_TEST(ecore_test_ecore_thread_eina_thread_queue_t7) 659EFL_START_TEST(ecore_test_ecore_thread_eina_thread_queue_t7)
660{ 660{
661 Msg7 *msg; 661 Msg7 *msg;
662 void *ref; 662 void *ref;
@@ -697,7 +697,7 @@ START_TEST(ecore_test_ecore_thread_eina_thread_queue_t7)
697 ecore_shutdown(); 697 ecore_shutdown();
698 eina_shutdown(); 698 eina_shutdown();
699} 699}
700END_TEST 700EFL_END_TEST
701 701
702void ecore_test_ecore_thread_eina_thread_queue(TCase *tc EINA_UNUSED) 702void ecore_test_ecore_thread_eina_thread_queue(TCase *tc EINA_UNUSED)
703{ 703{
diff --git a/src/tests/ecore/ecore_test_ecore_x.c b/src/tests/ecore/ecore_test_ecore_x.c
index bf7e57f..4618449 100644
--- a/src/tests/ecore/ecore_test_ecore_x.c
+++ b/src/tests/ecore/ecore_test_ecore_x.c
@@ -15,7 +15,7 @@
15 15
16#include <Ecore_X.h> 16#include <Ecore_X.h>
17 17
18START_TEST(ecore_test_ecore_x_init) 18EFL_START_TEST(ecore_test_ecore_x_init)
19{ 19{
20 int ret; 20 int ret;
21 21
@@ -25,9 +25,9 @@ START_TEST(ecore_test_ecore_x_init)
25 ret = ecore_x_shutdown(); 25 ret = ecore_x_shutdown();
26 fail_if(ret != 0); 26 fail_if(ret != 0);
27} 27}
28END_TEST 28EFL_END_TEST
29 29
30START_TEST(ecore_test_ecore_x_bell) 30EFL_START_TEST(ecore_test_ecore_x_bell)
31{ 31{
32 int i; 32 int i;
33 int ret; 33 int ret;
@@ -46,7 +46,7 @@ START_TEST(ecore_test_ecore_x_bell)
46 46
47 ecore_x_shutdown(); 47 ecore_x_shutdown();
48} 48}
49END_TEST 49EFL_END_TEST
50 50
51#endif 51#endif
52 52
diff --git a/src/tests/ecore/ecore_test_job.c b/src/tests/ecore/ecore_test_job.c
index 537cbb7..496b449 100644
--- a/src/tests/ecore/ecore_test_job.c
+++ b/src/tests/ecore/ecore_test_job.c
@@ -14,7 +14,7 @@ _ecore_quit(void *data)
14 ecore_main_loop_quit(); 14 ecore_main_loop_quit();
15} 15}
16 16
17START_TEST(ecore_test_job) 17EFL_START_TEST(ecore_test_job)
18{ 18{
19 Eina_Bool bob = EINA_FALSE; 19 Eina_Bool bob = EINA_FALSE;
20 Ecore_Job *job; 20 Ecore_Job *job;
@@ -30,7 +30,7 @@ START_TEST(ecore_test_job)
30 30
31 ecore_shutdown(); 31 ecore_shutdown();
32} 32}
33END_TEST 33EFL_END_TEST
34 34
35void ecore_test_ecore_job(TCase *tc) 35void ecore_test_ecore_job(TCase *tc)
36{ 36{
diff --git a/src/tests/ecore/ecore_test_promise.c b/src/tests/ecore/ecore_test_promise.c
index 3a3aab6..90b96f3 100644
--- a/src/tests/ecore/ecore_test_promise.c
+++ b/src/tests/ecore/ecore_test_promise.c
@@ -55,7 +55,7 @@ _death(void *data, const Efl_Event *ev EINA_UNUSED)
55} 55}
56 56
57// Test value set after then 57// Test value set after then
58START_TEST(efl_test_promise_future_success) 58EFL_START_TEST(efl_test_promise_future_success)
59{ 59{
60 Efl_Promise *p; 60 Efl_Promise *p;
61 Efl_Future *f; 61 Efl_Future *f;
@@ -93,10 +93,10 @@ START_TEST(efl_test_promise_future_success)
93 93
94 ecore_shutdown(); 94 ecore_shutdown();
95} 95}
96END_TEST 96EFL_END_TEST
97 97
98// Test value set before future_get 98// Test value set before future_get
99START_TEST(efl_test_promise_future_success_before_get) 99EFL_START_TEST(efl_test_promise_future_success_before_get)
100{ 100{
101 Efl_Promise *p; 101 Efl_Promise *p;
102 Efl_Future *f; 102 Efl_Future *f;
@@ -133,9 +133,9 @@ START_TEST(efl_test_promise_future_success_before_get)
133 133
134 ecore_shutdown(); 134 ecore_shutdown();
135} 135}
136END_TEST 136EFL_END_TEST
137 137
138START_TEST(efl_test_promise_future_cancel) 138EFL_START_TEST(efl_test_promise_future_cancel)
139{ 139{
140 Efl_Promise *p; 140 Efl_Promise *p;
141 Efl_Future *f; 141 Efl_Future *f;
@@ -177,10 +177,10 @@ START_TEST(efl_test_promise_future_cancel)
177 177
178 ecore_shutdown(); 178 ecore_shutdown();
179} 179}
180END_TEST 180EFL_END_TEST
181 181
182// Test value set before then 182// Test value set before then
183START_TEST(efl_test_promise_before_future_success) 183EFL_START_TEST(efl_test_promise_before_future_success)
184{ 184{
185 Efl_Promise *p; 185 Efl_Promise *p;
186 Efl_Future *f; 186 Efl_Future *f;
@@ -216,9 +216,9 @@ START_TEST(efl_test_promise_before_future_success)
216 216
217 ecore_shutdown(); 217 ecore_shutdown();
218} 218}
219END_TEST 219EFL_END_TEST
220 220
221START_TEST(efl_test_promise_before_future_cancel) 221EFL_START_TEST(efl_test_promise_before_future_cancel)
222{ 222{
223 Efl_Promise *p; 223 Efl_Promise *p;
224 Efl_Future *f; 224 Efl_Future *f;
@@ -259,7 +259,7 @@ START_TEST(efl_test_promise_before_future_cancel)
259 259
260 ecore_shutdown(); 260 ecore_shutdown();
261} 261}
262END_TEST 262EFL_END_TEST
263 263
264static void 264static void
265_chain_then(void *data, const Efl_Event *ev) 265_chain_then(void *data, const Efl_Event *ev)
@@ -298,7 +298,7 @@ _chain_progress(void *data, const Efl_Event *ev)
298} 298}
299 299
300// Test chained then 300// Test chained then
301START_TEST(efl_test_promise_future_chain_success) 301EFL_START_TEST(efl_test_promise_future_chain_success)
302{ 302{
303 Efl_Promise *p; 303 Efl_Promise *p;
304 Efl_Future *f1, *f2; 304 Efl_Future *f1, *f2;
@@ -343,9 +343,9 @@ START_TEST(efl_test_promise_future_chain_success)
343 343
344 ecore_shutdown(); 344 ecore_shutdown();
345} 345}
346END_TEST 346EFL_END_TEST
347 347
348START_TEST(efl_test_promise_future_chain_cancel) 348EFL_START_TEST(efl_test_promise_future_chain_cancel)
349{ 349{
350 Efl_Promise *p; 350 Efl_Promise *p;
351 Efl_Future *f1, *f2; 351 Efl_Future *f1, *f2;
@@ -394,10 +394,10 @@ START_TEST(efl_test_promise_future_chain_cancel)
394 394
395 ecore_shutdown(); 395 ecore_shutdown();
396} 396}
397END_TEST 397EFL_END_TEST
398 398
399// Test value set after multi then 399// Test value set after multi then
400START_TEST(efl_test_promise_future_multi_success) 400EFL_START_TEST(efl_test_promise_future_multi_success)
401{ 401{
402 Efl_Promise *p; 402 Efl_Promise *p;
403 Efl_Future *f; 403 Efl_Future *f;
@@ -440,9 +440,9 @@ START_TEST(efl_test_promise_future_multi_success)
440 440
441 ecore_shutdown(); 441 ecore_shutdown();
442} 442}
443END_TEST 443EFL_END_TEST
444 444
445START_TEST(efl_test_promise_future_multi_success_noref) 445EFL_START_TEST(efl_test_promise_future_multi_success_noref)
446{ 446{
447 Efl_Promise *p; 447 Efl_Promise *p;
448 Efl_Future *f; 448 Efl_Future *f;
@@ -483,9 +483,9 @@ START_TEST(efl_test_promise_future_multi_success_noref)
483 483
484 ecore_shutdown(); 484 ecore_shutdown();
485} 485}
486END_TEST 486EFL_END_TEST
487 487
488START_TEST(efl_test_promise_future_multi_cancel) 488EFL_START_TEST(efl_test_promise_future_multi_cancel)
489{ 489{
490 Efl_Promise *p; 490 Efl_Promise *p;
491 Efl_Future *f; 491 Efl_Future *f;
@@ -530,10 +530,10 @@ START_TEST(efl_test_promise_future_multi_cancel)
530 530
531 ecore_shutdown(); 531 ecore_shutdown();
532} 532}
533END_TEST 533EFL_END_TEST
534 534
535// Test value set before multi then 535// Test value set before multi then
536START_TEST(efl_test_promise_before_future_multi_success) 536EFL_START_TEST(efl_test_promise_before_future_multi_success)
537{ 537{
538 Efl_Promise *p; 538 Efl_Promise *p;
539 Efl_Future *f; 539 Efl_Future *f;
@@ -574,9 +574,9 @@ START_TEST(efl_test_promise_before_future_multi_success)
574 574
575 ecore_shutdown(); 575 ecore_shutdown();
576} 576}
577END_TEST 577EFL_END_TEST
578 578
579START_TEST(efl_test_promise_before_future_multi_success_noref) 579EFL_START_TEST(efl_test_promise_before_future_multi_success_noref)
580{ 580{
581 Efl_Promise *p; 581 Efl_Promise *p;
582 Efl_Future *f; 582 Efl_Future *f;
@@ -615,9 +615,9 @@ START_TEST(efl_test_promise_before_future_multi_success_noref)
615 615
616 ecore_shutdown(); 616 ecore_shutdown();
617} 617}
618END_TEST 618EFL_END_TEST
619 619
620START_TEST(efl_test_promise_before_future_multi_cancel) 620EFL_START_TEST(efl_test_promise_before_future_multi_cancel)
621{ 621{
622 Efl_Promise *p; 622 Efl_Promise *p;
623 Efl_Future *f; 623 Efl_Future *f;
@@ -667,9 +667,9 @@ START_TEST(efl_test_promise_before_future_multi_cancel)
667 667
668 ecore_shutdown(); 668 ecore_shutdown();
669} 669}
670END_TEST 670EFL_END_TEST
671 671
672START_TEST(efl_test_promise_before_future_multi_cancel_noref) 672EFL_START_TEST(efl_test_promise_before_future_multi_cancel_noref)
673{ 673{
674 Efl_Promise *p; 674 Efl_Promise *p;
675 Efl_Future *f; 675 Efl_Future *f;
@@ -719,7 +719,7 @@ START_TEST(efl_test_promise_before_future_multi_cancel_noref)
719 719
720 ecore_shutdown(); 720 ecore_shutdown();
721} 721}
722END_TEST 722EFL_END_TEST
723 723
724static Eina_Bool cleanup = EINA_FALSE; 724static Eina_Bool cleanup = EINA_FALSE;
725 725
@@ -730,7 +730,7 @@ _cleanup_called(void *s EINA_UNUSED)
730} 730}
731 731
732// Test optional value set without then 732// Test optional value set without then
733START_TEST(efl_test_promise_future_optional_success) 733EFL_START_TEST(efl_test_promise_future_optional_success)
734{ 734{
735 Efl_Promise *p; 735 Efl_Promise *p;
736 Efl_Future *f; 736 Efl_Future *f;
@@ -768,9 +768,9 @@ START_TEST(efl_test_promise_future_optional_success)
768 768
769 ecore_shutdown(); 769 ecore_shutdown();
770} 770}
771END_TEST 771EFL_END_TEST
772 772
773START_TEST(efl_test_promise_future_optional_cancel) 773EFL_START_TEST(efl_test_promise_future_optional_cancel)
774{ 774{
775 Efl_Promise *p; 775 Efl_Promise *p;
776 Efl_Future *f; 776 Efl_Future *f;
@@ -812,7 +812,7 @@ START_TEST(efl_test_promise_future_optional_cancel)
812 812
813 ecore_shutdown(); 813 ecore_shutdown();
814} 814}
815END_TEST 815EFL_END_TEST
816 816
817static int value[] = { 42, 7, 3 }; 817static int value[] = { 42, 7, 3 };
818 818
@@ -834,7 +834,7 @@ _then_all(void *data, const Efl_Event *ev)
834 fo->then = EINA_TRUE; 834 fo->then = EINA_TRUE;
835} 835}
836 836
837START_TEST(efl_test_promise_all) 837EFL_START_TEST(efl_test_promise_all)
838{ 838{
839 Efl_Promise *p1, *p2, *p3; 839 Efl_Promise *p1, *p2, *p3;
840 Efl_Future *all = NULL, *f1; 840 Efl_Future *all = NULL, *f1;
@@ -883,9 +883,9 @@ START_TEST(efl_test_promise_all)
883 883
884 ecore_shutdown(); 884 ecore_shutdown();
885} 885}
886END_TEST 886EFL_END_TEST
887 887
888START_TEST(efl_test_promise_all_after_value_set) 888EFL_START_TEST(efl_test_promise_all_after_value_set)
889{ 889{
890 Efl_Promise *p1, *p2, *p3; 890 Efl_Promise *p1, *p2, *p3;
891 Efl_Future *all = NULL, *f1, *f2, *f3; 891 Efl_Future *all = NULL, *f1, *f2, *f3;
@@ -927,7 +927,7 @@ START_TEST(efl_test_promise_all_after_value_set)
927 927
928 ecore_shutdown(); 928 ecore_shutdown();
929} 929}
930END_TEST 930EFL_END_TEST
931 931
932static void 932static void
933_then_race(void *data, const Efl_Event *ev) 933_then_race(void *data, const Efl_Event *ev)
@@ -942,7 +942,7 @@ _then_race(void *data, const Efl_Event *ev)
942 fo->then = EINA_TRUE; 942 fo->then = EINA_TRUE;
943} 943}
944 944
945START_TEST(efl_test_promise_race) 945EFL_START_TEST(efl_test_promise_race)
946{ 946{
947 Efl_Promise *p1, *p2, *p3; 947 Efl_Promise *p1, *p2, *p3;
948 Efl_Future *race = NULL, *f1; 948 Efl_Future *race = NULL, *f1;
@@ -979,9 +979,9 @@ START_TEST(efl_test_promise_race)
979 979
980 ecore_shutdown(); 980 ecore_shutdown();
981} 981}
982END_TEST 982EFL_END_TEST
983 983
984START_TEST(efl_test_future_link) 984EFL_START_TEST(efl_test_future_link)
985{ 985{
986 Efl_Promise *p; 986 Efl_Promise *p;
987 Efl_Future *f; 987 Efl_Future *f;
@@ -1009,7 +1009,7 @@ START_TEST(efl_test_future_link)
1009 1009
1010 ecore_shutdown(); 1010 ecore_shutdown();
1011} 1011}
1012END_TEST 1012EFL_END_TEST
1013 1013
1014static Efl_Future *recursive_future = NULL; 1014static Efl_Future *recursive_future = NULL;
1015 1015
@@ -1019,7 +1019,7 @@ _then_cleanup(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
1019 efl_future_cancel(recursive_future); 1019 efl_future_cancel(recursive_future);
1020} 1020}
1021 1021
1022START_TEST(efl_test_recursive_mess) 1022EFL_START_TEST(efl_test_recursive_mess)
1023{ 1023{
1024 Efl_Promise *p; 1024 Efl_Promise *p;
1025 Future_Ok done = { EINA_FALSE, EINA_FALSE, EINA_FALSE }; 1025 Future_Ok done = { EINA_FALSE, EINA_FALSE, EINA_FALSE };
@@ -1038,7 +1038,7 @@ START_TEST(efl_test_recursive_mess)
1038 1038
1039 ecore_shutdown(); 1039 ecore_shutdown();
1040} 1040}
1041END_TEST 1041EFL_END_TEST
1042 1042
1043void ecore_test_ecore_promise(TCase *tc) 1043void ecore_test_ecore_promise(TCase *tc)
1044{ 1044{
diff --git a/src/tests/ecore/ecore_test_promise2.c b/src/tests/ecore/ecore_test_promise2.c
index 52ae594..5cc28ae 100644
--- a/src/tests/ecore/ecore_test_promise2.c
+++ b/src/tests/ecore/ecore_test_promise2.c
@@ -484,7 +484,7 @@ _promise_empty_done(void *data, const Eina_Value value, const Eina_Future *dead_
484 return value; 484 return value;
485} 485}
486 486
487START_TEST(efl_test_timeout) 487EFL_START_TEST(efl_test_timeout)
488{ 488{
489 Eina_Future *f; 489 Eina_Future *f;
490 Eina_Bool done = EINA_FALSE; 490 Eina_Bool done = EINA_FALSE;
@@ -498,9 +498,9 @@ START_TEST(efl_test_timeout)
498 498
499 fail_unless(done); 499 fail_unless(done);
500} 500}
501END_TEST 501EFL_END_TEST
502 502
503START_TEST(efl_test_job) 503EFL_START_TEST(efl_test_job)
504{ 504{
505 Eina_Future *f; 505 Eina_Future *f;
506 Eina_Bool done = EINA_FALSE; 506 Eina_Bool done = EINA_FALSE;
@@ -514,9 +514,9 @@ START_TEST(efl_test_job)
514 514
515 fail_unless(done); 515 fail_unless(done);
516} 516}
517END_TEST 517EFL_END_TEST
518 518
519START_TEST(efl_test_idle) 519EFL_START_TEST(efl_test_idle)
520{ 520{
521 Eina_Future *f; 521 Eina_Future *f;
522 Eina_Bool done = EINA_FALSE; 522 Eina_Bool done = EINA_FALSE;
@@ -530,10 +530,10 @@ START_TEST(efl_test_idle)
530 530
531 fail_unless(done); 531 fail_unless(done);
532} 532}
533END_TEST 533EFL_END_TEST
534 534
535 535
536START_TEST(efl_test_promise_future_success) 536EFL_START_TEST(efl_test_promise_future_success)
537{ 537{
538 Eina_Future *f; 538 Eina_Future *f;
539 fail_if(!ecore_init()); 539 fail_if(!ecore_init());
@@ -543,9 +543,9 @@ START_TEST(efl_test_promise_future_success)
543 ecore_main_loop_begin(); 543 ecore_main_loop_begin();
544 ecore_shutdown(); 544 ecore_shutdown();
545} 545}
546END_TEST 546EFL_END_TEST
547 547
548START_TEST(efl_test_promise_future_failure) 548EFL_START_TEST(efl_test_promise_future_failure)
549{ 549{
550 Eina_Future *f; 550 Eina_Future *f;
551 fail_if(!ecore_init()); 551 fail_if(!ecore_init());
@@ -555,9 +555,9 @@ START_TEST(efl_test_promise_future_failure)
555 ecore_main_loop_begin(); 555 ecore_main_loop_begin();
556 ecore_shutdown(); 556 ecore_shutdown();
557} 557}
558END_TEST 558EFL_END_TEST
559 559
560START_TEST(efl_test_promise_future_chain_no_error) 560EFL_START_TEST(efl_test_promise_future_chain_no_error)
561{ 561{
562 Eina_Future *f; 562 Eina_Future *f;
563 static int i = 0; 563 static int i = 0;
@@ -572,9 +572,9 @@ START_TEST(efl_test_promise_future_chain_no_error)
572 ecore_main_loop_begin(); 572 ecore_main_loop_begin();
573 ecore_shutdown(); 573 ecore_shutdown();
574} 574}
575END_TEST 575EFL_END_TEST
576 576
577START_TEST(efl_test_promise_future_chain_error) 577EFL_START_TEST(efl_test_promise_future_chain_error)
578{ 578{
579 Eina_Future *f; 579 Eina_Future *f;
580 static int i = 0; 580 static int i = 0;
@@ -589,9 +589,9 @@ START_TEST(efl_test_promise_future_chain_error)
589 ecore_main_loop_begin(); 589 ecore_main_loop_begin();
590 ecore_shutdown(); 590 ecore_shutdown();
591} 591}
592END_TEST 592EFL_END_TEST
593 593
594START_TEST(efl_test_promise_future_cancel) 594EFL_START_TEST(efl_test_promise_future_cancel)
595{ 595{
596 fail_if(!ecore_init()); 596 fail_if(!ecore_init());
597 int i; 597 int i;
@@ -638,9 +638,9 @@ START_TEST(efl_test_promise_future_cancel)
638 } 638 }
639 ecore_shutdown(); 639 ecore_shutdown();
640} 640}
641END_TEST 641EFL_END_TEST
642 642
643START_TEST(efl_test_promise_future_inner_promise) 643EFL_START_TEST(efl_test_promise_future_inner_promise)
644{ 644{
645 Eina_Future *f; 645 Eina_Future *f;
646 646
@@ -652,9 +652,9 @@ START_TEST(efl_test_promise_future_inner_promise)
652 ecore_main_loop_begin(); 652 ecore_main_loop_begin();
653 ecore_shutdown(); 653 ecore_shutdown();
654} 654}
655END_TEST 655EFL_END_TEST
656 656
657START_TEST(efl_test_promise_future_inner_promise_fail) 657EFL_START_TEST(efl_test_promise_future_inner_promise_fail)
658{ 658{
659 Eina_Future *f; 659 Eina_Future *f;
660 void *data =(void *) 0x01; 660 void *data =(void *) 0x01;
@@ -667,9 +667,9 @@ START_TEST(efl_test_promise_future_inner_promise_fail)
667 ecore_main_loop_begin(); 667 ecore_main_loop_begin();
668 ecore_shutdown(); 668 ecore_shutdown();
669} 669}
670END_TEST 670EFL_END_TEST
671 671
672START_TEST(efl_test_promise_future_implicit_cancel) 672EFL_START_TEST(efl_test_promise_future_implicit_cancel)
673{ 673{
674 Eina_Promise *p; 674 Eina_Promise *p;
675 Eina_Future *f; 675 Eina_Future *f;
@@ -699,9 +699,9 @@ START_TEST(efl_test_promise_future_implicit_cancel)
699 //Cancel should not be called, since we called eina_promise_resolve() 699 //Cancel should not be called, since we called eina_promise_resolve()
700 fail_if(cancel_called); 700 fail_if(cancel_called);
701} 701}
702END_TEST 702EFL_END_TEST
703 703
704START_TEST(efl_test_promise_future_convert) 704EFL_START_TEST(efl_test_promise_future_convert)
705{ 705{
706 Eina_Future *f; 706 Eina_Future *f;
707 707
@@ -714,9 +714,9 @@ START_TEST(efl_test_promise_future_convert)
714 ecore_shutdown(); 714 ecore_shutdown();
715 715
716} 716}
717END_TEST 717EFL_END_TEST
718 718
719START_TEST(efl_test_promise_future_easy) 719EFL_START_TEST(efl_test_promise_future_easy)
720{ 720{
721 Eina_Future *f; 721 Eina_Future *f;
722 Easy_Ctx easy1 = { 0 }; 722 Easy_Ctx easy1 = { 0 };
@@ -744,9 +744,9 @@ START_TEST(efl_test_promise_future_easy)
744 fail_if(!(easy2.success_called && !easy2.error_called && easy2.free_called)); 744 fail_if(!(easy2.success_called && !easy2.error_called && easy2.free_called));
745 fail_if(!(!easy3.success_called && easy3.error_called && easy3.free_called)); 745 fail_if(!(!easy3.success_called && easy3.error_called && easy3.free_called));
746} 746}
747END_TEST 747EFL_END_TEST
748 748
749START_TEST(efl_test_promise_future_all) 749EFL_START_TEST(efl_test_promise_future_all)
750{ 750{
751 Eina_Future *futures[11]; 751 Eina_Future *futures[11];
752 unsigned int i, futures_called = 0, len = EINA_C_ARRAY_LENGTH(futures); 752 unsigned int i, futures_called = 0, len = EINA_C_ARRAY_LENGTH(futures);
@@ -770,9 +770,9 @@ START_TEST(efl_test_promise_future_all)
770 ecore_shutdown(); 770 ecore_shutdown();
771 fail_if(futures_called != len); 771 fail_if(futures_called != len);
772} 772}
773END_TEST 773EFL_END_TEST
774 774
775START_TEST(efl_test_promise_future_race) 775EFL_START_TEST(efl_test_promise_future_race)
776{ 776{
777 Race_Ctx ctx = { 0 }; 777 Race_Ctx ctx = { 0 };
778 Eina_Future *futures[11]; 778 Eina_Future *futures[11];
@@ -804,7 +804,7 @@ START_TEST(efl_test_promise_future_race)
804 fail_if(ctx.success != 1); 804 fail_if(ctx.success != 1);
805 fail_if(ctx.failed != (len - 1)); 805 fail_if(ctx.failed != (len - 1));
806} 806}
807END_TEST 807EFL_END_TEST
808 808
809static Eina_Value 809static Eina_Value
810_eo_future1_ok(Eo *eo EINA_UNUSED, const Eina_Value v) 810_eo_future1_ok(Eo *eo EINA_UNUSED, const Eina_Value v)
@@ -861,7 +861,7 @@ _eo_chain_stop(void *data EINA_UNUSED, const Eina_Value v, const Eina_Future *de
861 return v; 861 return v;
862} 862}
863 863
864START_TEST(efl_test_promise_eo) 864EFL_START_TEST(efl_test_promise_eo)
865{ 865{
866 Eina_Future *f; 866 Eina_Future *f;
867 Eo *obj; 867 Eo *obj;
@@ -886,7 +886,7 @@ START_TEST(efl_test_promise_eo)
886 efl_object_shutdown(); 886 efl_object_shutdown();
887 ck_assert_int_eq(free_called, 2); 887 ck_assert_int_eq(free_called, 2);
888} 888}
889END_TEST 889EFL_END_TEST
890 890
891static Eina_Value 891static Eina_Value
892_eo_future_link_success(Eo *eo EINA_UNUSED, const Eina_Value v) 892_eo_future_link_success(Eo *eo EINA_UNUSED, const Eina_Value v)
@@ -920,7 +920,7 @@ _eo_link_chain_end(void *data EINA_UNUSED, const Eina_Value v, const Eina_Future
920 return v; 920 return v;
921} 921}
922 922
923START_TEST(efl_test_promise_eo_link) 923EFL_START_TEST(efl_test_promise_eo_link)
924{ 924{
925 Eina_Future *f; 925 Eina_Future *f;
926 Eo *obj; 926 Eo *obj;
@@ -952,7 +952,7 @@ START_TEST(efl_test_promise_eo_link)
952 efl_object_shutdown(); 952 efl_object_shutdown();
953 ck_assert_int_eq(err_called, 6); 953 ck_assert_int_eq(err_called, 6);
954} 954}
955END_TEST 955EFL_END_TEST
956 956
957static Eina_Value 957static Eina_Value
958_err_ignored(void *data EINA_UNUSED, const Eina_Value v, const Eina_Future *f EINA_UNUSED) 958_err_ignored(void *data EINA_UNUSED, const Eina_Value v, const Eina_Future *f EINA_UNUSED)
@@ -963,7 +963,7 @@ _err_ignored(void *data EINA_UNUSED, const Eina_Value v, const Eina_Future *f EI
963 return v; 963 return v;
964} 964}
965 965
966START_TEST(efl_test_promise_future_ignore_error) 966EFL_START_TEST(efl_test_promise_future_ignore_error)
967{ 967{
968 Eina_Future *f; 968 Eina_Future *f;
969 969
@@ -975,7 +975,7 @@ START_TEST(efl_test_promise_future_ignore_error)
975 ecore_main_loop_begin(); 975 ecore_main_loop_begin();
976 ecore_shutdown(); 976 ecore_shutdown();
977} 977}
978END_TEST 978EFL_END_TEST
979 979
980#define PROMISE_LOG_DOMAIN_STR ("promise_test_domain") 980#define PROMISE_LOG_DOMAIN_STR ("promise_test_domain")
981 981
@@ -1059,7 +1059,7 @@ _log_test(const Eina_Log_Domain *d,
1059 *log_ok = EINA_TRUE; 1059 *log_ok = EINA_TRUE;
1060} 1060}
1061 1061
1062START_TEST(efl_test_promise_log) 1062EFL_START_TEST(efl_test_promise_log)
1063{ 1063{
1064 Promise_Log_Ctx ctx = { 0 }; 1064 Promise_Log_Ctx ctx = { 0 };
1065 Eina_Future *f; 1065 Eina_Future *f;
@@ -1103,7 +1103,7 @@ START_TEST(efl_test_promise_log)
1103 fail_if(!ctx.err_log_ok); 1103 fail_if(!ctx.err_log_ok);
1104 fail_if(!ctx.info_log_ok); 1104 fail_if(!ctx.info_log_ok);
1105} 1105}
1106END_TEST 1106EFL_END_TEST
1107 1107
1108#ifdef EINA_SAFETY_CHECKS 1108#ifdef EINA_SAFETY_CHECKS
1109 1109
@@ -1112,7 +1112,7 @@ _dummy_cancel(void *data EINA_UNUSED, const Eina_Promise *dead EINA_UNUSED)
1112{ 1112{
1113} 1113}
1114 1114
1115START_TEST(efl_test_promise_null) 1115EFL_START_TEST(efl_test_promise_null)
1116{ 1116{
1117 Log_Ctx ctx = { 0 }; 1117 Log_Ctx ctx = { 0 };
1118 Eina_Promise *p; 1118 Eina_Promise *p;
@@ -1132,9 +1132,9 @@ START_TEST(efl_test_promise_null)
1132 1132
1133 ecore_shutdown(); 1133 ecore_shutdown();
1134} 1134}
1135END_TEST 1135EFL_END_TEST
1136 1136
1137START_TEST(efl_test_promise_reject_resolve_null) 1137EFL_START_TEST(efl_test_promise_reject_resolve_null)
1138{ 1138{
1139 Log_Ctx ctx = { 0 }; 1139 Log_Ctx ctx = { 0 };
1140 Eina_Value v; 1140 Eina_Value v;
@@ -1153,7 +1153,7 @@ START_TEST(efl_test_promise_reject_resolve_null)
1153 fail_unless(ctx.did); 1153 fail_unless(ctx.did);
1154 ecore_shutdown(); 1154 ecore_shutdown();
1155} 1155}
1156END_TEST 1156EFL_END_TEST
1157 1157
1158static Eina_Value 1158static Eina_Value
1159_future_null_cb(void *data, const Eina_Value v, const Eina_Future *dead) 1159_future_null_cb(void *data, const Eina_Value v, const Eina_Future *dead)
@@ -1194,7 +1194,7 @@ _future_easy_null_free(void *data, const Eina_Future *dead)
1194 (*cb_called)++; 1194 (*cb_called)++;
1195} 1195}
1196 1196
1197START_TEST(efl_test_future_null) 1197EFL_START_TEST(efl_test_future_null)
1198{ 1198{
1199 Eina_Future *f; 1199 Eina_Future *f;
1200 Log_Ctx ctx = { 0 }; 1200 Log_Ctx ctx = { 0 };
@@ -1237,7 +1237,7 @@ START_TEST(efl_test_future_null)
1237 ck_assert_int_eq(easy_cb_calls, 2); 1237 ck_assert_int_eq(easy_cb_calls, 2);
1238 ecore_shutdown(); 1238 ecore_shutdown();
1239} 1239}
1240END_TEST 1240EFL_END_TEST
1241 1241
1242static Eina_Value 1242static Eina_Value
1243_future_race_all_null_cb(void *data, const Eina_Value v, const Eina_Future *dead EINA_UNUSED) 1243_future_race_all_null_cb(void *data, const Eina_Value v, const Eina_Future *dead EINA_UNUSED)
@@ -1252,7 +1252,7 @@ _future_race_all_null_cb(void *data, const Eina_Value v, const Eina_Future *dead
1252 return v; 1252 return v;
1253} 1253}
1254 1254
1255START_TEST(efl_test_future_all_null) 1255EFL_START_TEST(efl_test_future_all_null)
1256{ 1256{
1257 Log_Ctx ctx = { 0 }; 1257 Log_Ctx ctx = { 0 };
1258 unsigned i, len; 1258 unsigned i, len;
@@ -1281,9 +1281,9 @@ START_TEST(efl_test_future_all_null)
1281 ecore_shutdown(); 1281 ecore_shutdown();
1282 ck_assert_int_eq(cb_called, len); 1282 ck_assert_int_eq(cb_called, len);
1283} 1283}
1284END_TEST 1284EFL_END_TEST
1285 1285
1286START_TEST(efl_test_future_race_null) 1286EFL_START_TEST(efl_test_future_race_null)
1287{ 1287{
1288 Log_Ctx ctx = { 0 }; 1288 Log_Ctx ctx = { 0 };
1289 unsigned i, len; 1289 unsigned i, len;
@@ -1312,7 +1312,7 @@ START_TEST(efl_test_future_race_null)
1312 ecore_shutdown(); 1312 ecore_shutdown();
1313 ck_assert_int_eq(cb_called, len); 1313 ck_assert_int_eq(cb_called, len);
1314} 1314}
1315END_TEST 1315EFL_END_TEST
1316 1316
1317#endif 1317#endif
1318 1318
diff --git a/src/tests/ecore/ecore_test_timer.c b/src/tests/ecore/ecore_test_timer.c
index 8895a36..760a287 100644
--- a/src/tests/ecore/ecore_test_timer.c
+++ b/src/tests/ecore/ecore_test_timer.c
@@ -152,7 +152,7 @@ _timer5_cb(void *data)
152 Timer 5 finishes testing. 152 Timer 5 finishes testing.
153*/ 153*/
154 154
155START_TEST(ecore_test_timers) 155EFL_START_TEST(ecore_test_timers)
156{ 156{
157 struct _timers timer = \ 157 struct _timers timer = \
158 { 158 {
@@ -189,7 +189,7 @@ START_TEST(ecore_test_timers)
189 ecore_shutdown(); 189 ecore_shutdown();
190 190
191} 191}
192END_TEST 192EFL_END_TEST
193 193
194typedef struct _Test_Inside_Call 194typedef struct _Test_Inside_Call
195{ 195{
@@ -212,7 +212,7 @@ _timeri_cb(void *data)
212 return it != 0; 212 return it != 0;
213} 213}
214 214
215START_TEST(ecore_test_timer_inside_call) 215EFL_START_TEST(ecore_test_timer_inside_call)
216{ 216{
217 Test_Inside_Call c; 217 Test_Inside_Call c;
218 218
@@ -228,7 +228,7 @@ START_TEST(ecore_test_timer_inside_call)
228 ecore_shutdown(); 228 ecore_shutdown();
229 229
230} 230}
231END_TEST 231EFL_END_TEST
232 232
233static Eina_Bool 233static Eina_Bool
234_test_time_cb(void *data) 234_test_time_cb(void *data)
@@ -254,7 +254,7 @@ _test_run_cb(void *data, const Efl_Event *ev EINA_UNUSED)
254 _test_time_cb(data); 254 _test_time_cb(data);
255} 255}
256 256
257START_TEST(ecore_test_timer_lifecycle) 257EFL_START_TEST(ecore_test_timer_lifecycle)
258{ 258{
259 Eina_Bool rl = EINA_FALSE, re = EINA_FALSE; 259 Eina_Bool rl = EINA_FALSE, re = EINA_FALSE;
260 Eina_Bool dl = EINA_FALSE, de = EINA_FALSE; 260 Eina_Bool dl = EINA_FALSE, de = EINA_FALSE;
@@ -284,17 +284,17 @@ START_TEST(ecore_test_timer_lifecycle)
284 284
285 efl_object_shutdown(); 285 efl_object_shutdown();
286} 286}
287END_TEST 287EFL_END_TEST
288 288
289 289
290START_TEST(ecore_test_timer_valid_callbackfunc) 290EFL_START_TEST(ecore_test_timer_valid_callbackfunc)
291{ 291{
292 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n"); 292 fail_if(!ecore_init(), "ERROR: Cannot init Ecore!\n");
293 Ecore_Timer *t = NULL; 293 Ecore_Timer *t = NULL;
294 fail_if((t = ecore_timer_add(0.5, NULL, NULL)), "ERROR: Invalid callback func!\n"); 294 fail_if((t = ecore_timer_add(0.5, NULL, NULL)), "ERROR: Invalid callback func!\n");
295 ecore_shutdown(); 295 ecore_shutdown();
296} 296}
297END_TEST 297EFL_END_TEST
298 298
299void ecore_test_timer(TCase *tc) 299void ecore_test_timer(TCase *tc)
300{ 300{
diff --git a/src/tests/ecore/efl_app_suite.c b/src/tests/ecore/efl_app_suite.c
index 1736152..7523bda 100644
--- a/src/tests/ecore/efl_app_suite.c
+++ b/src/tests/ecore/efl_app_suite.c
@@ -10,7 +10,7 @@
10#include "efl_app_suite.h" 10#include "efl_app_suite.h"
11#include "../efl_check.h" 11#include "../efl_check.h"
12 12
13START_TEST(efl_app_test_efl_loop_register) 13EFL_START_TEST(efl_app_test_efl_loop_register)
14{ 14{
15 Efl_Object *t, *n; 15 Efl_Object *t, *n;
16 16
@@ -41,9 +41,9 @@ START_TEST(efl_app_test_efl_loop_register)
41 41
42 ecore_shutdown(); 42 ecore_shutdown();
43} 43}
44END_TEST 44EFL_END_TEST
45 45
46START_TEST(efl_app_test_efl_build_version) 46EFL_START_TEST(efl_app_test_efl_build_version)
47{ 47{
48 const Efl_Version *ver; 48 const Efl_Version *ver;
49 Eo *app; 49 Eo *app;
@@ -70,7 +70,7 @@ START_TEST(efl_app_test_efl_build_version)
70 70
71 ecore_shutdown(); 71 ecore_shutdown();
72} 72}
73END_TEST 73EFL_END_TEST
74 74
75void efl_test_efl_app(TCase *tc) 75void efl_test_efl_app(TCase *tc)
76{ 76{
diff --git a/src/tests/ecore/efl_app_suite.h b/src/tests/ecore/efl_app_suite.h
index c04dcbe..5309a79 100644
--- a/src/tests/ecore/efl_app_suite.h
+++ b/src/tests/ecore/efl_app_suite.h
@@ -2,7 +2,7 @@
2#define _EFL_APP_SUITE_H 2#define _EFL_APP_SUITE_H
3 3
4#include <check.h> 4#include <check.h>
5 5#include "../efl_check.h"
6void efl_app_test_efl_app(TCase *tc); 6void efl_app_test_efl_app(TCase *tc);
7 7
8#endif /* _EFL_APP_SUITE_H */ 8#endif /* _EFL_APP_SUITE_H */
diff --git a/src/tests/ecore_con/ecore_con_suite.h b/src/tests/ecore_con/ecore_con_suite.h
index 133b68a..2c16d2d 100644
--- a/src/tests/ecore_con/ecore_con_suite.h
+++ b/src/tests/ecore_con/ecore_con_suite.h
@@ -2,7 +2,7 @@
2#define _ECORE_CON_SUITE_H 2#define _ECORE_CON_SUITE_H
3 3
4#include <check.h> 4#include <check.h>
5 5#include "../efl_check.h"
6void ecore_con_test_ecore_con(TCase *tc); 6void ecore_con_test_ecore_con(TCase *tc);
7void ecore_con_test_ecore_con_url(TCase *tc); 7void ecore_con_test_ecore_con_url(TCase *tc);
8void ecore_con_test_ecore_con_eet(TCase *tc); 8void ecore_con_test_ecore_con_eet(TCase *tc);
diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con.c b/src/tests/ecore_con/ecore_con_test_ecore_con.c
index 87522c0..df481bc 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con.c
@@ -322,13 +322,13 @@ void _ecore_con_server_client_tests(Ecore_Con_Type compl_type, const char *name,
322 ret = eina_shutdown(); 322 ret = eina_shutdown();
323} 323}
324 324
325START_TEST(ecore_test_ecore_con_local_user) 325EFL_START_TEST(ecore_test_ecore_con_local_user)
326{ 326{
327 _ecore_con_server_client_tests(ECORE_CON_LOCAL_USER, "test_sock", EINA_FALSE, 12345); 327 _ecore_con_server_client_tests(ECORE_CON_LOCAL_USER, "test_sock", EINA_FALSE, 12345);
328} 328}
329END_TEST 329EFL_END_TEST
330 330
331START_TEST(ecore_test_ecore_con_local_user_home) 331EFL_START_TEST(ecore_test_ecore_con_local_user_home)
332{ 332{
333 const char *xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"); 333 const char *xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
334 334
@@ -336,9 +336,9 @@ START_TEST(ecore_test_ecore_con_local_user_home)
336 _ecore_con_server_client_tests(ECORE_CON_LOCAL_USER, "test_soc", EINA_FALSE, 12345); 336 _ecore_con_server_client_tests(ECORE_CON_LOCAL_USER, "test_soc", EINA_FALSE, 12345);
337 if (xdg_runtime_dir) setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1); 337 if (xdg_runtime_dir) setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1);
338} 338}
339END_TEST 339EFL_END_TEST
340 340
341START_TEST(ecore_test_ecore_con_local_user_tmp) 341EFL_START_TEST(ecore_test_ecore_con_local_user_tmp)
342{ 342{
343 const char *xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"); 343 const char *xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
344 const char *homedir = getenv("HOME"); 344 const char *homedir = getenv("HOME");
@@ -349,9 +349,9 @@ START_TEST(ecore_test_ecore_con_local_user_tmp)
349 if (homedir) setenv("HOME", homedir, 1); 349 if (homedir) setenv("HOME", homedir, 1);
350 if (xdg_runtime_dir) setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1); 350 if (xdg_runtime_dir) setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1);
351} 351}
352END_TEST 352EFL_END_TEST
353 353
354START_TEST(ecore_test_ecore_con_local_user_none) 354EFL_START_TEST(ecore_test_ecore_con_local_user_none)
355{ 355{
356 const char *xdg_runtime_dir = getenv("XDG_RUNTIME_DIR"); 356 const char *xdg_runtime_dir = getenv("XDG_RUNTIME_DIR");
357 const char *homedir = getenv("HOME"); 357 const char *homedir = getenv("HOME");
@@ -365,99 +365,99 @@ START_TEST(ecore_test_ecore_con_local_user_none)
365 if (homedir) setenv("HOME", homedir, 1); 365 if (homedir) setenv("HOME", homedir, 1);
366 if (xdg_runtime_dir) setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1); 366 if (xdg_runtime_dir) setenv("XDG_RUNTIME_DIR", xdg_runtime_dir, 1);
367} 367}
368END_TEST 368EFL_END_TEST
369 369
370START_TEST(ecore_test_ecore_con_local_system) 370EFL_START_TEST(ecore_test_ecore_con_local_system)
371{ 371{
372 _ecore_con_server_client_tests(ECORE_CON_LOCAL_SYSTEM, "test_sock", EINA_FALSE, 12345); 372 _ecore_con_server_client_tests(ECORE_CON_LOCAL_SYSTEM, "test_sock", EINA_FALSE, 12345);
373} 373}
374END_TEST 374EFL_END_TEST
375 375
376START_TEST(ecore_test_ecore_con_local_system_fullpath) 376EFL_START_TEST(ecore_test_ecore_con_local_system_fullpath)
377{ 377{
378 _ecore_con_server_client_tests(ECORE_CON_LOCAL_SYSTEM, "/tmp/test_sock", EINA_FALSE, 12345); 378 _ecore_con_server_client_tests(ECORE_CON_LOCAL_SYSTEM, "/tmp/test_sock", EINA_FALSE, 12345);
379} 379}
380END_TEST 380EFL_END_TEST
381 381
382START_TEST(ecore_test_ecore_con_local_system_negport) 382EFL_START_TEST(ecore_test_ecore_con_local_system_negport)
383{ 383{
384 _ecore_con_server_client_tests(ECORE_CON_LOCAL_SYSTEM, "test_sock", EINA_FALSE, -6); 384 _ecore_con_server_client_tests(ECORE_CON_LOCAL_SYSTEM, "test_sock", EINA_FALSE, -6);
385} 385}
386END_TEST 386EFL_END_TEST
387 387
388START_TEST(ecore_test_ecore_con_local_system_negport_fullpath) 388EFL_START_TEST(ecore_test_ecore_con_local_system_negport_fullpath)
389{ 389{
390 _ecore_con_server_client_tests(ECORE_CON_LOCAL_SYSTEM, "/tmp/test_sock", EINA_FALSE, -6); 390 _ecore_con_server_client_tests(ECORE_CON_LOCAL_SYSTEM, "/tmp/test_sock", EINA_FALSE, -6);
391} 391}
392END_TEST 392EFL_END_TEST
393 393
394START_TEST(ecore_test_ecore_con_local_abstract) 394EFL_START_TEST(ecore_test_ecore_con_local_abstract)
395{ 395{
396 _ecore_con_server_client_tests(ECORE_CON_LOCAL_ABSTRACT, "test_sock", EINA_FALSE, 12345); 396 _ecore_con_server_client_tests(ECORE_CON_LOCAL_ABSTRACT, "test_sock", EINA_FALSE, 12345);
397} 397}
398END_TEST 398EFL_END_TEST
399 399
400START_TEST(ecore_test_ecore_con_remote_tcp) 400EFL_START_TEST(ecore_test_ecore_con_remote_tcp)
401{ 401{
402 _ecore_con_server_client_tests(ECORE_CON_REMOTE_TCP, "127.0.0.1", EINA_FALSE, 12345); 402 _ecore_con_server_client_tests(ECORE_CON_REMOTE_TCP, "127.0.0.1", EINA_FALSE, 12345);
403} 403}
404END_TEST 404EFL_END_TEST
405 405
406START_TEST(ecore_test_ecore_con_remote_nodelay) 406EFL_START_TEST(ecore_test_ecore_con_remote_nodelay)
407{ 407{
408 _ecore_con_server_client_tests(ECORE_CON_REMOTE_NODELAY, "127.0.0.1", EINA_FALSE, 12345); 408 _ecore_con_server_client_tests(ECORE_CON_REMOTE_NODELAY, "127.0.0.1", EINA_FALSE, 12345);
409} 409}
410END_TEST 410EFL_END_TEST
411 411
412START_TEST(ecore_test_ecore_con_remote_tcp_tls) 412EFL_START_TEST(ecore_test_ecore_con_remote_tcp_tls)
413{ 413{
414 _ecore_con_server_client_tests(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_TLS, "127.0.0.1", EINA_TRUE, 12345); 414 _ecore_con_server_client_tests(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_TLS, "127.0.0.1", EINA_TRUE, 12345);
415} 415}
416END_TEST 416EFL_END_TEST
417 417
418START_TEST(ecore_test_ecore_con_remote_tcp_tls_load_cert) 418EFL_START_TEST(ecore_test_ecore_con_remote_tcp_tls_load_cert)
419{ 419{
420 _ecore_con_server_client_tests(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_TLS | ECORE_CON_LOAD_CERT, "127.0.0.1", EINA_TRUE, 12345); 420 _ecore_con_server_client_tests(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_TLS | ECORE_CON_LOAD_CERT, "127.0.0.1", EINA_TRUE, 12345);
421} 421}
422END_TEST 422EFL_END_TEST
423 423
424START_TEST(ecore_test_ecore_con_remote_tcp_mixed) 424EFL_START_TEST(ecore_test_ecore_con_remote_tcp_mixed)
425{ 425{
426 _ecore_con_server_client_tests(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_MIXED, "127.0.0.1", EINA_TRUE, 12345); 426 _ecore_con_server_client_tests(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_MIXED, "127.0.0.1", EINA_TRUE, 12345);
427} 427}
428END_TEST 428EFL_END_TEST
429 429
430START_TEST(ecore_test_ecore_con_remote_tcp_mixed_load_cert) 430EFL_START_TEST(ecore_test_ecore_con_remote_tcp_mixed_load_cert)
431{ 431{
432 _ecore_con_server_client_tests(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_MIXED | ECORE_CON_LOAD_CERT, "127.0.0.1", EINA_TRUE, 12345); 432 _ecore_con_server_client_tests(ECORE_CON_REMOTE_TCP | ECORE_CON_USE_MIXED | ECORE_CON_LOAD_CERT, "127.0.0.1", EINA_TRUE, 12345);
433} 433}
434END_TEST 434EFL_END_TEST
435 435
436START_TEST(ecore_test_ecore_con_remote_nodelay_tls) 436EFL_START_TEST(ecore_test_ecore_con_remote_nodelay_tls)
437{ 437{
438 _ecore_con_server_client_tests(ECORE_CON_REMOTE_NODELAY | ECORE_CON_USE_TLS, "127.0.0.1", EINA_TRUE, 12345); 438 _ecore_con_server_client_tests(ECORE_CON_REMOTE_NODELAY | ECORE_CON_USE_TLS, "127.0.0.1", EINA_TRUE, 12345);
439} 439}
440END_TEST 440EFL_END_TEST
441 441
442START_TEST(ecore_test_ecore_con_remote_nodelay_tls_load_cert) 442EFL_START_TEST(ecore_test_ecore_con_remote_nodelay_tls_load_cert)
443{ 443{
444 _ecore_con_server_client_tests(ECORE_CON_REMOTE_NODELAY | ECORE_CON_USE_TLS | ECORE_CON_LOAD_CERT, "127.0.0.1", EINA_TRUE, 12345); 444 _ecore_con_server_client_tests(ECORE_CON_REMOTE_NODELAY | ECORE_CON_USE_TLS | ECORE_CON_LOAD_CERT, "127.0.0.1", EINA_TRUE, 12345);
445} 445}
446END_TEST 446EFL_END_TEST
447 447
448START_TEST(ecore_test_ecore_con_remote_nodelay_mixed) 448EFL_START_TEST(ecore_test_ecore_con_remote_nodelay_mixed)
449{ 449{
450 _ecore_con_server_client_tests(ECORE_CON_REMOTE_NODELAY | ECORE_CON_USE_MIXED, "127.0.0.1", EINA_TRUE, 12345); 450 _ecore_con_server_client_tests(ECORE_CON_REMOTE_NODELAY | ECORE_CON_USE_MIXED, "127.0.0.1", EINA_TRUE, 12345);
451} 451}
452END_TEST 452EFL_END_TEST
453 453
454START_TEST(ecore_test_ecore_con_remote_nodelay_mixed_load_cert) 454EFL_START_TEST(ecore_test_ecore_con_remote_nodelay_mixed_load_cert)
455{ 455{
456 _ecore_con_server_client_tests(ECORE_CON_REMOTE_NODELAY | ECORE_CON_USE_MIXED | ECORE_CON_LOAD_CERT, "127.0.0.1", EINA_TRUE, 12345); 456 _ecore_con_server_client_tests(ECORE_CON_REMOTE_NODELAY | ECORE_CON_USE_MIXED | ECORE_CON_LOAD_CERT, "127.0.0.1", EINA_TRUE, 12345);
457} 457}
458END_TEST 458EFL_END_TEST
459 459
460START_TEST(ecore_test_ecore_con_ssl_available) 460EFL_START_TEST(ecore_test_ecore_con_ssl_available)
461{ 461{
462 int ret = ecore_con_ssl_available_get(); 462 int ret = ecore_con_ssl_available_get();
463#ifdef HAVE_GNUTLS 463#ifdef HAVE_GNUTLS
@@ -468,9 +468,9 @@ START_TEST(ecore_test_ecore_con_ssl_available)
468 fail_if(!ret); 468 fail_if(!ret);
469#endif 469#endif
470} 470}
471END_TEST 471EFL_END_TEST
472 472
473START_TEST(ecore_test_ecore_con_init) 473EFL_START_TEST(ecore_test_ecore_con_init)
474{ 474{
475 int ret; 475 int ret;
476 476
@@ -480,9 +480,9 @@ START_TEST(ecore_test_ecore_con_init)
480 ret = ecore_con_shutdown(); 480 ret = ecore_con_shutdown();
481 fail_if(ret != 0); 481 fail_if(ret != 0);
482} 482}
483END_TEST 483EFL_END_TEST
484 484
485START_TEST(ecore_test_ecore_con_dns) 485EFL_START_TEST(ecore_test_ecore_con_dns)
486{ 486{
487 Ecore_Con_Server *client; 487 Ecore_Con_Server *client;
488 Ecore_Event_Handler *e_err; 488 Ecore_Event_Handler *e_err;
@@ -514,9 +514,9 @@ START_TEST(ecore_test_ecore_con_dns)
514 fail_if(ret != 0); 514 fail_if(ret != 0);
515 ret = eina_shutdown(); 515 ret = eina_shutdown();
516} 516}
517END_TEST 517EFL_END_TEST
518 518
519START_TEST(ecore_test_ecore_con_shutdown_bef_init) 519EFL_START_TEST(ecore_test_ecore_con_shutdown_bef_init)
520{ 520{
521 int ret; 521 int ret;
522 522
@@ -531,7 +531,7 @@ START_TEST(ecore_test_ecore_con_shutdown_bef_init)
531 fail_if(ret != 0); 531 fail_if(ret != 0);
532 eina_shutdown(); 532 eina_shutdown();
533} 533}
534END_TEST 534EFL_END_TEST
535 535
536static void 536static void
537_lookup_done_cb(const char *canonname, const char *ip, struct sockaddr *addr, int addrlen, void *data) 537_lookup_done_cb(const char *canonname, const char *ip, struct sockaddr *addr, int addrlen, void *data)
@@ -546,7 +546,7 @@ _lookup_done_cb(const char *canonname, const char *ip, struct sockaddr *addr, in
546 ecore_main_loop_quit(); 546 ecore_main_loop_quit();
547} 547}
548 548
549START_TEST(ecore_test_ecore_con_dns_lookup) 549EFL_START_TEST(ecore_test_ecore_con_dns_lookup)
550{ 550{
551 const char link[] = "www.google.com"; 551 const char link[] = "www.google.com";
552 ecore_con_init(); 552 ecore_con_init();
@@ -557,7 +557,7 @@ START_TEST(ecore_test_ecore_con_dns_lookup)
557 557
558 ecore_con_shutdown(); 558 ecore_con_shutdown();
559} 559}
560END_TEST 560EFL_END_TEST
561 561
562void ecore_con_test_ecore_con(TCase *tc) 562void ecore_con_test_ecore_con(TCase *tc)
563{ 563{
diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c b/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c
index 9a054e3..bc27f52 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con_eet.c
@@ -111,7 +111,7 @@ _eet_raw_data_cb(void *data, Ecore_Con_Reply *reply, const char *protocol_name E
111 ecore_con_server_del(cl); 111 ecore_con_server_del(cl);
112} 112}
113 113
114START_TEST(ecore_con_test_ecore_con_eet_svr_cl) 114EFL_START_TEST(ecore_con_test_ecore_con_eet_svr_cl)
115{ 115{
116 Ecore_Con_Eet *ece_svr, *ece_cl; 116 Ecore_Con_Eet *ece_svr, *ece_cl;
117 Ecore_Con_Server *svr, *cl; 117 Ecore_Con_Server *svr, *cl;
@@ -169,7 +169,7 @@ START_TEST(ecore_con_test_ecore_con_eet_svr_cl)
169 eet_shutdown(); 169 eet_shutdown();
170 eina_shutdown(); 170 eina_shutdown();
171} 171}
172END_TEST 172EFL_END_TEST
173 173
174static Eina_Bool 174static Eina_Bool
175_eet_svr_discnct_cb(void *data EINA_UNUSED, Ecore_Con_Reply *reply EINA_UNUSED, Ecore_Con_Server *conn EINA_UNUSED) 175_eet_svr_discnct_cb(void *data EINA_UNUSED, Ecore_Con_Reply *reply EINA_UNUSED, Ecore_Con_Server *conn EINA_UNUSED)
@@ -193,7 +193,7 @@ _eet_svr_raw_data_cb(void *data, Ecore_Con_Reply *reply, const char *protocol_na
193 ecore_con_server_del(svr); 193 ecore_con_server_del(svr);
194} 194}
195 195
196START_TEST(ecore_con_test_ecore_con_eet_svr_del) 196EFL_START_TEST(ecore_con_test_ecore_con_eet_svr_del)
197{ 197{
198 Ecore_Con_Eet *ece_svr, *ece_cl; 198 Ecore_Con_Eet *ece_svr, *ece_cl;
199 Ecore_Con_Server *svr, *cl; 199 Ecore_Con_Server *svr, *cl;
@@ -239,7 +239,7 @@ START_TEST(ecore_con_test_ecore_con_eet_svr_del)
239 eet_shutdown(); 239 eet_shutdown();
240 eina_shutdown(); 240 eina_shutdown();
241} 241}
242END_TEST 242EFL_END_TEST
243 243
244void ecore_con_test_ecore_con_eet(TCase *tc) 244void ecore_con_test_ecore_con_eet(TCase *tc)
245{ 245{
diff --git a/src/tests/ecore_con/ecore_con_test_ecore_con_url.c b/src/tests/ecore_con/ecore_con_test_ecore_con_url.c
index 1b73218..c1da064 100644
--- a/src/tests/ecore_con/ecore_con_test_ecore_con_url.c
+++ b/src/tests/ecore_con/ecore_con_test_ecore_con_url.c
@@ -164,7 +164,7 @@ error_user:
164#endif 164#endif
165 165
166#ifdef ECORE_CON_FTP_TEST_URL 166#ifdef ECORE_CON_FTP_TEST_URL
167START_TEST(ecore_con_test_ecore_con_url_ftp_upload) 167EFL_START_TEST(ecore_con_test_ecore_con_url_ftp_upload)
168{ 168{
169 Ecore_Con_Url *ec_url; 169 Ecore_Con_Url *ec_url;
170 url_test *info = NULL; 170 url_test *info = NULL;
@@ -198,11 +198,11 @@ START_TEST(ecore_con_test_ecore_con_url_ftp_upload)
198 fail_if(ret != 0); 198 fail_if(ret != 0);
199 ret = eina_shutdown(); 199 ret = eina_shutdown();
200} 200}
201END_TEST 201EFL_END_TEST
202#endif 202#endif
203 203
204#ifdef ECORE_CON_HTTP_TEST_URL 204#ifdef ECORE_CON_HTTP_TEST_URL
205START_TEST(ecore_con_test_ecore_con_url_post) 205EFL_START_TEST(ecore_con_test_ecore_con_url_post)
206{ 206{
207 Ecore_Con_Url *ec_url; 207 Ecore_Con_Url *ec_url;
208 url_test *info = NULL; 208 url_test *info = NULL;
@@ -242,10 +242,10 @@ START_TEST(ecore_con_test_ecore_con_url_post)
242 fail_if(ret != 0); 242 fail_if(ret != 0);
243 ret = eina_shutdown(); 243 ret = eina_shutdown();
244} 244}
245END_TEST 245EFL_END_TEST
246#endif 246#endif
247 247
248START_TEST(ecore_con_test_ecore_con_url_download) 248EFL_START_TEST(ecore_con_test_ecore_con_url_download)
249{ 249{
250 Ecore_Con_Url *url; 250 Ecore_Con_Url *url;
251 url_test *info; 251 url_test *info;
@@ -292,9 +292,9 @@ START_TEST(ecore_con_test_ecore_con_url_download)
292 fail_if(ret != 0); 292 fail_if(ret != 0);
293 ret = eina_shutdown(); 293 ret = eina_shutdown();
294} 294}
295END_TEST 295EFL_END_TEST
296 296
297START_TEST(ecore_con_test_ecore_con_url_create) 297EFL_START_TEST(ecore_con_test_ecore_con_url_create)
298{ 298{
299 Ecore_Con_Url *url; 299 Ecore_Con_Url *url;
300 int ret; 300 int ret;
@@ -313,9 +313,9 @@ START_TEST(ecore_con_test_ecore_con_url_create)
313 fail_if(ret != 0); 313 fail_if(ret != 0);
314 ret = eina_shutdown(); 314 ret = eina_shutdown();
315} 315}
316END_TEST 316EFL_END_TEST
317 317
318START_TEST(ecore_con_test_ecore_con_url_init) 318EFL_START_TEST(ecore_con_test_ecore_con_url_init)
319{ 319{
320 int ret; 320 int ret;
321 321
@@ -325,7 +325,7 @@ START_TEST(ecore_con_test_ecore_con_url_init)
325 ret = ecore_con_url_shutdown(); 325 ret = ecore_con_url_shutdown();
326 fail_if(ret != 0); 326 fail_if(ret != 0);
327} 327}
328END_TEST 328EFL_END_TEST
329 329
330static Eina_Bool 330static Eina_Bool
331_url_cookies_compl_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event_info) 331_url_cookies_compl_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event_info)
@@ -389,7 +389,7 @@ _ecore_con_url_cookies_test_shutdown(Ecore_Con_Url *ec_url, int tmpfd, Eina_Tmps
389 eina_shutdown(); 389 eina_shutdown();
390} 390}
391 391
392START_TEST(ecore_con_test_ecore_con_url_cookies_clear) 392EFL_START_TEST(ecore_con_test_ecore_con_url_cookies_clear)
393{ 393{
394 Ecore_Con_Url *ec_url = _ecore_con_url_cookies_test_init(); 394 Ecore_Con_Url *ec_url = _ecore_con_url_cookies_test_init();
395 Eina_Tmpstr *path; 395 Eina_Tmpstr *path;
@@ -407,9 +407,9 @@ START_TEST(ecore_con_test_ecore_con_url_cookies_clear)
407 407
408 _ecore_con_url_cookies_test_shutdown(ec_url, tmpfd, &path); 408 _ecore_con_url_cookies_test_shutdown(ec_url, tmpfd, &path);
409} 409}
410END_TEST 410EFL_END_TEST
411 411
412START_TEST(ecore_con_test_ecore_con_url_cookies_clear_session) 412EFL_START_TEST(ecore_con_test_ecore_con_url_cookies_clear_session)
413{ 413{
414 Ecore_Con_Url *ec_url = _ecore_con_url_cookies_test_init(); 414 Ecore_Con_Url *ec_url = _ecore_con_url_cookies_test_init();
415 Eina_Tmpstr *path; 415 Eina_Tmpstr *path;
@@ -427,9 +427,9 @@ START_TEST(ecore_con_test_ecore_con_url_cookies_clear_session)
427 427
428 _ecore_con_url_cookies_test_shutdown(ec_url, tmpfd, &path); 428 _ecore_con_url_cookies_test_shutdown(ec_url, tmpfd, &path);
429} 429}
430END_TEST 430EFL_END_TEST
431 431
432START_TEST(ecore_con_test_ecore_con_url_cookies_ignore_session) 432EFL_START_TEST(ecore_con_test_ecore_con_url_cookies_ignore_session)
433{ 433{
434 Ecore_Con_Url *ec_url = _ecore_con_url_cookies_test_init(); 434 Ecore_Con_Url *ec_url = _ecore_con_url_cookies_test_init();
435 Eina_Tmpstr *path; 435 Eina_Tmpstr *path;
@@ -446,7 +446,7 @@ START_TEST(ecore_con_test_ecore_con_url_cookies_ignore_session)
446 446
447 _ecore_con_url_cookies_test_shutdown(ec_url, tmpfd, &path); 447 _ecore_con_url_cookies_test_shutdown(ec_url, tmpfd, &path);
448} 448}
449END_TEST 449EFL_END_TEST
450 450
451void ecore_con_test_ecore_con_url(TCase *tc) 451void ecore_con_test_ecore_con_url(TCase *tc)
452{ 452{
diff --git a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
index 4a54c98..477b242 100644
--- a/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
+++ b/src/tests/ecore_con/ecore_con_test_efl_net_ip_address.c
@@ -295,7 +295,7 @@ _ipv4_check(Eo *o, const struct sockaddr_in *addr)
295 ck_assert_str_eq(efl_net_ip_address_string_get(o), buf); 295 ck_assert_str_eq(efl_net_ip_address_string_get(o), buf);
296} 296}
297 297
298START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_ok) 298EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_ok)
299{ 299{
300 struct sockaddr_in addr = { 300 struct sockaddr_in addr = {
301 .sin_family = AF_INET, 301 .sin_family = AF_INET,
@@ -333,9 +333,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_ok)
333 333
334 ecore_con_shutdown(); 334 ecore_con_shutdown();
335} 335}
336END_TEST 336EFL_END_TEST
337 337
338START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail) 338EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail)
339{ 339{
340 uint8_t c = 123; 340 uint8_t c = 123;
341 Eina_Slice wrong_slice = { .mem = &c, .len = 1 }; 341 Eina_Slice wrong_slice = { .mem = &c, .len = 1 };
@@ -421,9 +421,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_manual_fail)
421 421
422 ecore_con_shutdown(); 422 ecore_con_shutdown();
423} 423}
424END_TEST 424EFL_END_TEST
425 425
426START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok) 426EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
427{ 427{
428 struct sockaddr_in addr = { 428 struct sockaddr_in addr = {
429 .sin_family = AF_INET, 429 .sin_family = AF_INET,
@@ -459,9 +459,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_create_ok)
459 459
460 ecore_con_shutdown(); 460 ecore_con_shutdown();
461} 461}
462END_TEST 462EFL_END_TEST
463 463
464START_TEST(ecore_test_efl_net_ip_address_ipv4_create_fail) 464EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_fail)
465{ 465{
466 uint8_t c = 123; 466 uint8_t c = 123;
467 Eina_Slice wrong_slice = { .mem = &c, .len = 1 }; 467 Eina_Slice wrong_slice = { .mem = &c, .len = 1 };
@@ -478,9 +478,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_create_fail)
478 478
479 ecore_con_shutdown(); 479 ecore_con_shutdown();
480} 480}
481END_TEST 481EFL_END_TEST
482 482
483START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_ok) 483EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_ok)
484{ 484{
485 struct sockaddr_in addr = { 485 struct sockaddr_in addr = {
486 .sin_family = AF_INET, 486 .sin_family = AF_INET,
@@ -505,9 +505,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_ok)
505 505
506 ecore_con_shutdown(); 506 ecore_con_shutdown();
507} 507}
508END_TEST 508EFL_END_TEST
509 509
510START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_fail) 510EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_fail)
511{ 511{
512 struct sockaddr_in addr = { 512 struct sockaddr_in addr = {
513 .sin_family = AF_UNSPEC, 513 .sin_family = AF_UNSPEC,
@@ -528,9 +528,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_create_sockaddr_fail)
528 528
529 ecore_con_shutdown(); 529 ecore_con_shutdown();
530} 530}
531END_TEST 531EFL_END_TEST
532 532
533START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_ok) 533EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_ok)
534{ 534{
535 Eo *o; 535 Eo *o;
536 536
@@ -558,9 +558,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_ok)
558 558
559 ecore_con_shutdown(); 559 ecore_con_shutdown();
560} 560}
561END_TEST 561EFL_END_TEST
562 562
563START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_fail) 563EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_fail)
564{ 564{
565 Eo *o; 565 Eo *o;
566 566
@@ -596,9 +596,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_parse_fail)
596 596
597 ecore_con_shutdown(); 597 ecore_con_shutdown();
598} 598}
599END_TEST 599EFL_END_TEST
600 600
601START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_ok) 601EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_ok)
602{ 602{
603 struct resolve_ctx ctx = { }; 603 struct resolve_ctx ctx = { };
604 604
@@ -634,9 +634,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_ok)
634 634
635 ecore_con_shutdown(); 635 ecore_con_shutdown();
636} 636}
637END_TEST 637EFL_END_TEST
638 638
639START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_fail) 639EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_fail)
640{ 640{
641 struct resolve_ctx ctx = { }; 641 struct resolve_ctx ctx = { };
642 642
@@ -664,9 +664,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_resolve_fail)
664 664
665 ecore_con_shutdown(); 665 ecore_con_shutdown();
666} 666}
667END_TEST 667EFL_END_TEST
668 668
669START_TEST(ecore_test_efl_net_ip_address_ipv4_checks) 669EFL_START_TEST(ecore_test_efl_net_ip_address_ipv4_checks)
670{ 670{
671 const struct test { 671 const struct test {
672 uint32_t addr; 672 uint32_t addr;
@@ -721,7 +721,7 @@ START_TEST(ecore_test_efl_net_ip_address_ipv4_checks)
721 721
722 ecore_con_shutdown(); 722 ecore_con_shutdown();
723} 723}
724END_TEST 724EFL_END_TEST
725 725
726/* IPv6 *****************************************************************/ 726/* IPv6 *****************************************************************/
727 727
@@ -761,7 +761,7 @@ _ipv6_set(struct sockaddr_in6 *addr, uint16_t s1, uint16_t s2, uint16_t s3, uint
761 memcpy(&addr->sin6_addr, s, 16); 761 memcpy(&addr->sin6_addr, s, 16);
762} 762}
763 763
764START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_ok) 764EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_ok)
765{ 765{
766 struct sockaddr_in6 addr = { 766 struct sockaddr_in6 addr = {
767 .sin6_family = AF_INET6, 767 .sin6_family = AF_INET6,
@@ -791,9 +791,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_ok)
791 791
792 ecore_con_shutdown(); 792 ecore_con_shutdown();
793} 793}
794END_TEST 794EFL_END_TEST
795 795
796START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail) 796EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail)
797{ 797{
798 uint8_t c = 123; 798 uint8_t c = 123;
799 Eina_Slice wrong_slice = { .mem = &c, .len = 1 }; 799 Eina_Slice wrong_slice = { .mem = &c, .len = 1 };
@@ -851,9 +851,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_manual_fail)
851 851
852 ecore_con_shutdown(); 852 ecore_con_shutdown();
853} 853}
854END_TEST 854EFL_END_TEST
855 855
856START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok) 856EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
857{ 857{
858 struct sockaddr_in6 addr = { 858 struct sockaddr_in6 addr = {
859 .sin6_family = AF_INET6, 859 .sin6_family = AF_INET6,
@@ -889,9 +889,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_create_ok)
889 889
890 ecore_con_shutdown(); 890 ecore_con_shutdown();
891} 891}
892END_TEST 892EFL_END_TEST
893 893
894START_TEST(ecore_test_efl_net_ip_address_ipv6_create_sockaddr_ok) 894EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_create_sockaddr_ok)
895{ 895{
896 struct sockaddr_in6 addr = { 896 struct sockaddr_in6 addr = {
897 .sin6_family = AF_INET6, 897 .sin6_family = AF_INET6,
@@ -916,9 +916,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_create_sockaddr_ok)
916 916
917 ecore_con_shutdown(); 917 ecore_con_shutdown();
918} 918}
919END_TEST 919EFL_END_TEST
920 920
921START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_ok) 921EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_ok)
922{ 922{
923 Eo *o; 923 Eo *o;
924 924
@@ -1010,9 +1010,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_ok)
1010 1010
1011 ecore_con_shutdown(); 1011 ecore_con_shutdown();
1012} 1012}
1013END_TEST 1013EFL_END_TEST
1014 1014
1015START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_fail) 1015EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_fail)
1016{ 1016{
1017 Eo *o; 1017 Eo *o;
1018 1018
@@ -1039,7 +1039,7 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_parse_fail)
1039 1039
1040 ecore_con_shutdown(); 1040 ecore_con_shutdown();
1041} 1041}
1042END_TEST 1042EFL_END_TEST
1043 1043
1044static const char * 1044static const char *
1045_ipv6_localhost_check(void) 1045_ipv6_localhost_check(void)
@@ -1130,7 +1130,7 @@ _ipv6_localhost_check(void)
1130 return found; 1130 return found;
1131} 1131}
1132 1132
1133START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_ok) 1133EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_ok)
1134{ 1134{
1135 struct resolve_ctx ctx = { }; 1135 struct resolve_ctx ctx = { };
1136 char buf[4096]; 1136 char buf[4096];
@@ -1185,9 +1185,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_ok)
1185 1185
1186 ecore_con_shutdown(); 1186 ecore_con_shutdown();
1187} 1187}
1188END_TEST 1188EFL_END_TEST
1189 1189
1190START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_fail) 1190EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_fail)
1191{ 1191{
1192 struct resolve_ctx ctx = { }; 1192 struct resolve_ctx ctx = { };
1193 1193
@@ -1203,9 +1203,9 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_resolve_fail)
1203 1203
1204 ecore_con_shutdown(); 1204 ecore_con_shutdown();
1205} 1205}
1206END_TEST 1206EFL_END_TEST
1207 1207
1208START_TEST(ecore_test_efl_net_ip_address_ipv6_checks) 1208EFL_START_TEST(ecore_test_efl_net_ip_address_ipv6_checks)
1209{ 1209{
1210 const struct test { 1210 const struct test {
1211 const char *str; 1211 const char *str;
@@ -1258,7 +1258,7 @@ START_TEST(ecore_test_efl_net_ip_address_ipv6_checks)
1258 1258
1259 ecore_con_shutdown(); 1259 ecore_con_shutdown();
1260} 1260}
1261END_TEST 1261EFL_END_TEST
1262 1262
1263void ecore_con_test_efl_net_ip_address(TCase *tc) 1263void ecore_con_test_efl_net_ip_address(TCase *tc)
1264{ 1264{
diff --git a/src/tests/ecore_cxx/ecore_cxx_suite.h b/src/tests/ecore_cxx/ecore_cxx_suite.h
index 3434331..e0683e4 100644
--- a/src/tests/ecore_cxx/ecore_cxx_suite.h
+++ b/src/tests/ecore_cxx/ecore_cxx_suite.h
@@ -5,7 +5,7 @@
5#include <algorithm> 5#include <algorithm>
6 6
7#include <check.h> 7#include <check.h>
8 8#include "../efl_check.h"
9void ecore_cxx_test_safe_call(TCase* tc); 9void ecore_cxx_test_safe_call(TCase* tc);
10 10
11#endif /* _ECORE_CXX_SUITE_H */ 11#endif /* _ECORE_CXX_SUITE_H */
diff --git a/src/tests/ector/suite/ector_suite.h b/src/tests/ector/suite/ector_suite.h
index 176a838..7f9cd59 100644
--- a/src/tests/ector/suite/ector_suite.h
+++ b/src/tests/ector/suite/ector_suite.h
@@ -2,7 +2,7 @@
2#define ECTOR_SUITE_H 2#define ECTOR_SUITE_H
3 3
4#include <check.h> 4#include <check.h>
5 5#include "../efl_check.h"
6void ector_test_init(TCase *tc); 6void ector_test_init(TCase *tc);
7 7
8#endif 8#endif
diff --git a/src/tests/ector/suite/ector_test_init.c b/src/tests/ector/suite/ector_test_init.c
index 5194cbd..fd19c3d 100644
--- a/src/tests/ector/suite/ector_test_init.c
+++ b/src/tests/ector/suite/ector_test_init.c
@@ -24,12 +24,12 @@
24 24
25#include "ector_suite.h" 25#include "ector_suite.h"
26 26
27START_TEST(ector_init_simple) 27EFL_START_TEST(ector_init_simple)
28{ 28{
29 fail_if(ector_init() != 1); 29 fail_if(ector_init() != 1);
30 fail_if(ector_shutdown() != 0); 30 fail_if(ector_shutdown() != 0);
31} 31}
32END_TEST 32EFL_END_TEST
33 33
34void 34void
35ector_test_init(TCase *tc) 35ector_test_init(TCase *tc)
diff --git a/src/tests/edje/edje_suite.h b/src/tests/edje/edje_suite.h
index 35ab20d..a6f1354 100644
--- a/src/tests/edje/edje_suite.h
+++ b/src/tests/edje/edje_suite.h
@@ -2,7 +2,7 @@
2#define _EDJE_SUITE_H 2#define _EDJE_SUITE_H
3 3
4#include <check.h> 4#include <check.h>
5 5#include "../efl_check.h"
6void edje_test_edje(TCase *tc); 6void edje_test_edje(TCase *tc);
7 7
8 8
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 6432062..2a36674 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -16,7 +16,7 @@
16 16
17#define EVAS_DATA_DIR TESTS_SRC_DIR "/../../lib/evas" 17#define EVAS_DATA_DIR TESTS_SRC_DIR "/../../lib/evas"
18 18
19START_TEST(edje_test_edje_init) 19EFL_START_TEST(edje_test_edje_init)
20{ 20{
21 int ret; 21 int ret;
22 22
@@ -26,9 +26,9 @@ START_TEST(edje_test_edje_init)
26 ret = edje_shutdown(); 26 ret = edje_shutdown();
27 fail_if(ret != 0); 27 fail_if(ret != 0);
28} 28}
29END_TEST 29EFL_END_TEST
30 30
31START_TEST(edje_test_edje_load) 31EFL_START_TEST(edje_test_edje_load)
32{ 32{
33 Evas *evas = EDJE_TEST_INIT_EVAS(); 33 Evas *evas = EDJE_TEST_INIT_EVAS();
34 Edje_Load_Error error; 34 Edje_Load_Error error;
@@ -41,7 +41,7 @@ START_TEST(edje_test_edje_load)
41 41
42 EDJE_TEST_FREE_EVAS(); 42 EDJE_TEST_FREE_EVAS();
43} 43}
44END_TEST 44EFL_END_TEST
45 45
46static const char * 46static const char *
47test_layout_get(const char *name) 47test_layout_get(const char *name)
@@ -53,7 +53,7 @@ test_layout_get(const char *name)
53 return filename; 53 return filename;
54} 54}
55 55
56START_TEST(edje_test_load_simple_layout) 56EFL_START_TEST(edje_test_load_simple_layout)
57{ 57{
58 Evas *evas = EDJE_TEST_INIT_EVAS(); 58 Evas *evas = EDJE_TEST_INIT_EVAS();
59 Evas_Object *obj; 59 Evas_Object *obj;
@@ -67,9 +67,9 @@ START_TEST(edje_test_load_simple_layout)
67 67
68 EDJE_TEST_FREE_EVAS(); 68 EDJE_TEST_FREE_EVAS();
69} 69}
70END_TEST 70EFL_END_TEST
71 71
72START_TEST(edje_test_simple_layout_geometry) 72EFL_START_TEST(edje_test_simple_layout_geometry)
73{ 73{
74 int x, y, w, h; 74 int x, y, w, h;
75 int r, g, b, a; 75 int r, g, b, a;
@@ -96,9 +96,9 @@ START_TEST(edje_test_simple_layout_geometry)
96 96
97 EDJE_TEST_FREE_EVAS(); 97 EDJE_TEST_FREE_EVAS();
98} 98}
99END_TEST 99EFL_END_TEST
100 100
101START_TEST(edje_test_complex_layout) 101EFL_START_TEST(edje_test_complex_layout)
102{ 102{
103 int x, y, w, h; 103 int x, y, w, h;
104 Evas *evas = EDJE_TEST_INIT_EVAS(); 104 Evas *evas = EDJE_TEST_INIT_EVAS();
@@ -144,9 +144,9 @@ START_TEST(edje_test_complex_layout)
144 144
145 EDJE_TEST_FREE_EVAS(); 145 EDJE_TEST_FREE_EVAS();
146} 146}
147END_TEST 147EFL_END_TEST
148 148
149START_TEST(edje_test_calculate_parens) 149EFL_START_TEST(edje_test_calculate_parens)
150{ 150{
151 int x, y, w, h; 151 int x, y, w, h;
152 Evas *evas = EDJE_TEST_INIT_EVAS(); 152 Evas *evas = EDJE_TEST_INIT_EVAS();
@@ -167,9 +167,9 @@ START_TEST(edje_test_calculate_parens)
167 167
168 EDJE_TEST_FREE_EVAS(); 168 EDJE_TEST_FREE_EVAS();
169} 169}
170END_TEST 170EFL_END_TEST
171 171
172START_TEST(edje_test_masking) 172EFL_START_TEST(edje_test_masking)
173{ 173{
174 int x, y, w, h; 174 int x, y, w, h;
175 Evas *evas = EDJE_TEST_INIT_EVAS(); 175 Evas *evas = EDJE_TEST_INIT_EVAS();
@@ -201,9 +201,9 @@ START_TEST(edje_test_masking)
201 201
202 EDJE_TEST_FREE_EVAS(); 202 EDJE_TEST_FREE_EVAS();
203} 203}
204END_TEST 204EFL_END_TEST
205 205
206START_TEST(edje_test_filters) 206EFL_START_TEST(edje_test_filters)
207{ 207{
208 Evas *evas = EDJE_TEST_INIT_EVAS(); 208 Evas *evas = EDJE_TEST_INIT_EVAS();
209 const Evas_Object *text, *sub; 209 const Evas_Object *text, *sub;
@@ -242,9 +242,9 @@ START_TEST(edje_test_filters)
242 242
243 EDJE_TEST_FREE_EVAS(); 243 EDJE_TEST_FREE_EVAS();
244} 244}
245END_TEST 245EFL_END_TEST
246 246
247START_TEST(edje_test_snapshot) 247EFL_START_TEST(edje_test_snapshot)
248{ 248{
249 Evas *evas = EDJE_TEST_INIT_EVAS(); 249 Evas *evas = EDJE_TEST_INIT_EVAS();
250 const Evas_Object *sub; 250 const Evas_Object *sub;
@@ -266,9 +266,9 @@ START_TEST(edje_test_snapshot)
266 266
267 EDJE_TEST_FREE_EVAS(); 267 EDJE_TEST_FREE_EVAS();
268} 268}
269END_TEST 269EFL_END_TEST
270 270
271START_TEST(edje_test_size_class) 271EFL_START_TEST(edje_test_size_class)
272{ 272{
273 int minw, minh, minw2, minh2; 273 int minw, minh, minw2, minh2;
274 Evas *evas = EDJE_TEST_INIT_EVAS(); 274 Evas *evas = EDJE_TEST_INIT_EVAS();
@@ -320,9 +320,9 @@ START_TEST(edje_test_size_class)
320 320
321 EDJE_TEST_FREE_EVAS(); 321 EDJE_TEST_FREE_EVAS();
322} 322}
323END_TEST 323EFL_END_TEST
324 324
325START_TEST(edje_test_color_class) 325EFL_START_TEST(edje_test_color_class)
326{ 326{
327 Evas *evas = EDJE_TEST_INIT_EVAS(); 327 Evas *evas = EDJE_TEST_INIT_EVAS();
328 328
@@ -355,9 +355,9 @@ START_TEST(edje_test_color_class)
355 355
356 EDJE_TEST_FREE_EVAS(); 356 EDJE_TEST_FREE_EVAS();
357} 357}
358END_TEST 358EFL_END_TEST
359 359
360START_TEST(edje_test_swallows) 360EFL_START_TEST(edje_test_swallows)
361{ 361{
362 Evas *evas = EDJE_TEST_INIT_EVAS(); 362 Evas *evas = EDJE_TEST_INIT_EVAS();
363 Evas_Object *ly, *o1, *o2; 363 Evas_Object *ly, *o1, *o2;
@@ -386,9 +386,9 @@ START_TEST(edje_test_swallows)
386 386
387 EDJE_TEST_FREE_EVAS(); 387 EDJE_TEST_FREE_EVAS();
388} 388}
389END_TEST 389EFL_END_TEST
390 390
391START_TEST(edje_test_swallows_eoapi) 391EFL_START_TEST(edje_test_swallows_eoapi)
392{ 392{
393 Evas *evas = EDJE_TEST_INIT_EVAS(); 393 Evas *evas = EDJE_TEST_INIT_EVAS();
394 Evas_Object *ly, *o1, *o2; 394 Evas_Object *ly, *o1, *o2;
@@ -417,9 +417,9 @@ START_TEST(edje_test_swallows_eoapi)
417 417
418 EDJE_TEST_FREE_EVAS(); 418 EDJE_TEST_FREE_EVAS();
419} 419}
420END_TEST 420EFL_END_TEST
421 421
422START_TEST(edje_test_access) 422EFL_START_TEST(edje_test_access)
423{ 423{
424 Evas *evas = EDJE_TEST_INIT_EVAS(); 424 Evas *evas = EDJE_TEST_INIT_EVAS();
425 const char *name; 425 const char *name;
@@ -460,9 +460,9 @@ START_TEST(edje_test_access)
460 460
461 EDJE_TEST_FREE_EVAS(); 461 EDJE_TEST_FREE_EVAS();
462} 462}
463END_TEST 463EFL_END_TEST
464 464
465START_TEST(edje_test_box) 465EFL_START_TEST(edje_test_box)
466{ 466{
467 Evas *evas; 467 Evas *evas;
468 Evas_Object *obj, *sobj, *sobjs[5]; 468 Evas_Object *obj, *sobj, *sobjs[5];
@@ -499,9 +499,9 @@ START_TEST(edje_test_box)
499 499
500 EDJE_TEST_FREE_EVAS(); 500 EDJE_TEST_FREE_EVAS();
501} 501}
502END_TEST 502EFL_END_TEST
503 503
504START_TEST(edje_test_box_eoapi) 504EFL_START_TEST(edje_test_box_eoapi)
505{ 505{
506 Evas *evas; 506 Evas *evas;
507 Evas_Object *obj, *sobj, *sobjs[5]; 507 Evas_Object *obj, *sobj, *sobjs[5];
@@ -559,9 +559,9 @@ START_TEST(edje_test_box_eoapi)
559 559
560 EDJE_TEST_FREE_EVAS(); 560 EDJE_TEST_FREE_EVAS();
561} 561}
562END_TEST 562EFL_END_TEST
563 563
564START_TEST(edje_test_table) 564EFL_START_TEST(edje_test_table)
565{ 565{
566 Evas *evas; 566 Evas *evas;
567 Evas_Object *obj, *sobj, *sobjs[4]; 567 Evas_Object *obj, *sobj, *sobjs[4];
@@ -634,9 +634,9 @@ START_TEST(edje_test_table)
634 634
635 EDJE_TEST_FREE_EVAS(); 635 EDJE_TEST_FREE_EVAS();
636} 636}
637END_TEST 637EFL_END_TEST
638 638
639START_TEST(edje_test_table_eoapi) 639EFL_START_TEST(edje_test_table_eoapi)
640{ 640{
641 Evas *evas; 641 Evas *evas;
642 Evas_Object *obj, *sobj, *sobjs[4], *proxy; 642 Evas_Object *obj, *sobj, *sobjs[4], *proxy;
@@ -716,9 +716,9 @@ START_TEST(edje_test_table_eoapi)
716 716
717 EDJE_TEST_FREE_EVAS(); 717 EDJE_TEST_FREE_EVAS();
718} 718}
719END_TEST 719EFL_END_TEST
720 720
721START_TEST(edje_test_combine_keywords) 721EFL_START_TEST(edje_test_combine_keywords)
722{ 722{
723 Evas *evas; 723 Evas *evas;
724 Evas_Object *obj; 724 Evas_Object *obj;
@@ -730,7 +730,7 @@ START_TEST(edje_test_combine_keywords)
730 730
731 EDJE_TEST_FREE_EVAS(); 731 EDJE_TEST_FREE_EVAS();
732} 732}
733END_TEST 733EFL_END_TEST
734 734
735static void 735static void
736_message_signal_reply_cb(void *data, Evas_Object *obj EINA_UNUSED, 736_message_signal_reply_cb(void *data, Evas_Object *obj EINA_UNUSED,
@@ -760,7 +760,7 @@ _message_signal_reply_cb(void *data, Evas_Object *obj EINA_UNUSED,
760 (*id)++; 760 (*id)++;
761} 761}
762 762
763START_TEST(edje_test_message_send_legacy) 763EFL_START_TEST(edje_test_message_send_legacy)
764{ 764{
765 Evas *evas; 765 Evas *evas;
766 Evas_Object *obj; 766 Evas_Object *obj;
@@ -814,9 +814,9 @@ START_TEST(edje_test_message_send_legacy)
814 814
815 EDJE_TEST_FREE_EVAS(); 815 EDJE_TEST_FREE_EVAS();
816} 816}
817END_TEST 817EFL_END_TEST
818 818
819START_TEST(edje_test_message_send_eo) 819EFL_START_TEST(edje_test_message_send_eo)
820{ 820{
821 Evas *evas; 821 Evas *evas;
822 Evas_Object *obj; 822 Evas_Object *obj;
@@ -872,9 +872,9 @@ START_TEST(edje_test_message_send_eo)
872 872
873 EDJE_TEST_FREE_EVAS(); 873 EDJE_TEST_FREE_EVAS();
874} 874}
875END_TEST 875EFL_END_TEST
876 876
877START_TEST(edje_test_signals) 877EFL_START_TEST(edje_test_signals)
878{ 878{
879 Evas *evas; 879 Evas *evas;
880 Evas_Object *obj; 880 Evas_Object *obj;
@@ -905,7 +905,7 @@ START_TEST(edje_test_signals)
905 905
906 EDJE_TEST_FREE_EVAS(); 906 EDJE_TEST_FREE_EVAS();
907} 907}
908END_TEST 908EFL_END_TEST
909 909
910static int _signal_count; 910static int _signal_count;
911 911
@@ -917,7 +917,7 @@ _signal_callback_count_cb(void *data, Evas_Object *obj EINA_UNUSED,
917 _signal_count += *_data; 917 _signal_count += *_data;
918} 918}
919 919
920START_TEST(edje_test_signal_callback_del_full) 920EFL_START_TEST(edje_test_signal_callback_del_full)
921{ 921{
922 Evas *evas; 922 Evas *evas;
923 Evas_Object *obj; 923 Evas_Object *obj;
@@ -948,7 +948,7 @@ START_TEST(edje_test_signal_callback_del_full)
948 948
949 EDJE_TEST_FREE_EVAS(); 949 EDJE_TEST_FREE_EVAS();
950} 950}
951END_TEST 951EFL_END_TEST
952 952
953void edje_test_edje(TCase *tc) 953void edje_test_edje(TCase *tc)
954{ 954{
diff --git a/src/tests/eet/eet_suite.h b/src/tests/eet/eet_suite.h
index b7c3e59..9be74a9 100644
--- a/src/tests/eet/eet_suite.h
+++ b/src/tests/eet/eet_suite.h
@@ -2,7 +2,7 @@
2# define _EET_SUITE_H 2# define _EET_SUITE_H
3 3
4#include <check.h> 4#include <check.h>
5 5#include "../efl_check.h"
6void eet_test_init(TCase *tc); 6void eet_test_init(TCase *tc);
7void eet_test_data(TCase *tc); 7void eet_test_data(TCase *tc);
8void eet_test_file(TCase *tc); 8void eet_test_file(TCase *tc);
diff --git a/src/tests/eet/eet_test_cache.c b/src/tests/eet/eet_test_cache.c
index 6713c41..02a51ed 100644
--- a/src/tests/eet/eet_test_cache.c
+++ b/src/tests/eet/eet_test_cache.c
@@ -44,7 +44,7 @@ _open_close_worker(void *path, Eina_Thread tid EINA_UNUSED)
44 return NULL; 44 return NULL;
45} 45}
46 46
47START_TEST(eet_test_cache_concurrency) 47EFL_START_TEST(eet_test_cache_concurrency)
48{ 48{
49 char *file; 49 char *file;
50 const char *buffer = "test data"; 50 const char *buffer = "test data";
@@ -97,7 +97,7 @@ START_TEST(eet_test_cache_concurrency)
97 eina_threads_shutdown(); 97 eina_threads_shutdown();
98 eet_shutdown(); 98 eet_shutdown();
99} 99}
100END_TEST 100EFL_END_TEST
101 101
102void eet_test_cache(TCase *tc) 102void eet_test_cache(TCase *tc)
103{ 103{
diff --git a/src/tests/eet/eet_test_cipher.c b/src/tests/eet/eet_test_cipher.c
index 2cee686..eacc8e0 100644
--- a/src/tests/eet/eet_test_cipher.c
+++ b/src/tests/eet/eet_test_cipher.c
@@ -12,7 +12,7 @@
12#include "eet_suite.h" 12#include "eet_suite.h"
13#include "eet_test_common.h" 13#include "eet_test_common.h"
14 14
15START_TEST(eet_test_cipher_decipher_simple) 15EFL_START_TEST(eet_test_cipher_decipher_simple)
16{ 16{
17 const char *buffer = "Here is a string of data to save !"; 17 const char *buffer = "Here is a string of data to save !";
18 const char *key = "This is a crypto key"; 18 const char *key = "This is a crypto key";
@@ -64,7 +64,7 @@ START_TEST(eet_test_cipher_decipher_simple)
64 64
65 eet_shutdown(); 65 eet_shutdown();
66} 66}
67END_TEST 67EFL_END_TEST
68 68
69void eet_test_cipher(TCase *tc) 69void eet_test_cipher(TCase *tc)
70{ 70{
diff --git a/src/tests/eet/eet_test_connection.c b/src/tests/eet/eet_test_connection.c
index 28c3d5d..a839f51 100644
--- a/src/tests/eet/eet_test_connection.c
+++ b/src/tests/eet/eet_test_connection.c
@@ -87,7 +87,7 @@ _eet_connection_write(const void *data,
87 return EINA_TRUE; 87 return EINA_TRUE;
88} 88}
89 89
90START_TEST(eet_test_connection_check) 90EFL_START_TEST(eet_test_connection_check)
91{ 91{
92 Eet_Data_Descriptor *edd; 92 Eet_Data_Descriptor *edd;
93 Eet_Data_Descriptor_Class eddc; 93 Eet_Data_Descriptor_Class eddc;
@@ -142,7 +142,7 @@ START_TEST(eet_test_connection_check)
142 142
143 eet_shutdown(); 143 eet_shutdown();
144} 144}
145END_TEST 145EFL_END_TEST
146 146
147void eet_test_connection(TCase *tc) 147void eet_test_connection(TCase *tc)
148{ 148{
diff --git a/src/tests/eet/eet_test_data.c b/src/tests/eet/eet_test_data.c
index 4899832..f657201 100644
--- a/src/tests/eet/eet_test_data.c
+++ b/src/tests/eet/eet_test_data.c
@@ -279,7 +279,7 @@ _eet_st3_cmp(Eet_St3 *st3,
279 fail_if(st3->boby != EET_TEST_INT + i); 279 fail_if(st3->boby != EET_TEST_INT + i);
280} /* _eet_st3_cmp */ 280} /* _eet_st3_cmp */
281 281
282START_TEST(eet_test_data_basic_type_encoding_decoding) 282EFL_START_TEST(eet_test_data_basic_type_encoding_decoding)
283{ 283{
284 Eet_Data_Descriptor *edd; 284 Eet_Data_Descriptor *edd;
285 Eet_Test_Basic_Type *result; 285 Eet_Test_Basic_Type *result;
@@ -316,9 +316,9 @@ START_TEST(eet_test_data_basic_type_encoding_decoding)
316 316
317 eet_shutdown(); 317 eet_shutdown();
318} 318}
319END_TEST 319EFL_END_TEST
320 320
321START_TEST(eet_test_data_type_encoding_decoding)