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>

14 files changed, 121 insertions, 121 deletions

diff --git a/src/tests/evas/evas_suite.h b/src/tests/evas/evas_suite.h
index cb22dd4762..ea9f6fb070 100644
--- a/src/tests/evas/evas_suite.h
+++ b/src/tests/evas/evas_suite.h
@@ -2,7 +2,7 @@
 #define _EVAS_SUITE_H
 
 #include <check.h>
-
+#include "../efl_check.h"
 void evas_test_init(TCase *tc);
 void evas_test_object(TCase *tc);
 void evas_test_textblock(TCase *tc);
diff --git a/src/tests/evas/evas_test_callbacks.c b/src/tests/evas/evas_test_callbacks.c
index c871276f65..dc0bf31aa1 100644
--- a/src/tests/evas/evas_test_callbacks.c
+++ b/src/tests/evas/evas_test_callbacks.c
@@ -43,7 +43,7 @@ _obj_event_cb(void *data, Evas *e, Evas_Object *obj, void *event_info)
    counter++;
 }
 
-START_TEST(evas_object_event_callbacks_priority)
+EFL_START_TEST(evas_object_event_callbacks_priority)
 {
    START_CALLBACK_TEST();
    counter = 1;
@@ -93,7 +93,7 @@ START_TEST(evas_object_event_callbacks_priority)
 
    END_CALLBACK_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 static void
 _event_cb(void *data, Evas *e, void *event_info)
@@ -106,7 +106,7 @@ _event_cb(void *data, Evas *e, void *event_info)
    counter++;
 }
 
-START_TEST(evas_event_callbacks_priority)
+EFL_START_TEST(evas_event_callbacks_priority)
 {
    START_CALLBACK_TEST();
    evas_object_focus_set(rect, EINA_FALSE);
@@ -144,7 +144,7 @@ START_TEST(evas_event_callbacks_priority)
 
    END_CALLBACK_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 void evas_test_callbacks(TCase *tc)
 {
diff --git a/src/tests/evas/evas_test_evasgl.c b/src/tests/evas/evas_test_evasgl.c
index 67f39de598..b3e8305cc0 100644
--- a/src/tests/evas/evas_test_evasgl.c
+++ b/src/tests/evas/evas_test_evasgl.c
@@ -479,12 +479,12 @@ _test_evasgl_formats(const char *engine)
 }
 
 #define TEST_ADD_OPT(name, opt) \
-   START_TEST(evas ## name ## _opengl_x11) \
+   EFL_START_TEST(evas ## name ## _opengl_x11) \
    { name("opengl_x11"); } \
-   END_TEST \
-   START_TEST(evas ## name ## _buffer) \
+   EFL_END_TEST \
+   EFL_START_TEST(evas ## name ## _buffer) \
    { name("buffer"); } \
-   END_TEST
+   EFL_END_TEST
 #define TEST_ADD(name) TEST_ADD_OPT(name, NULL)
 
 TEST_ADD(_test_evasgl_init)
diff --git a/src/tests/evas/evas_test_filters.c b/src/tests/evas/evas_test_filters.c
index 6095c63a2a..a72da3bb33 100644
--- a/src/tests/evas/evas_test_filters.c
+++ b/src/tests/evas/evas_test_filters.c
@@ -61,7 +61,7 @@
 #endif
 
 
-START_TEST(evas_filter_parser)
+EFL_START_TEST(evas_filter_parser)
 {
    Evas_Filter_Program *pgm;
 
@@ -196,7 +196,7 @@ START_TEST(evas_filter_parser)
 
    // fillmodes are parsed when converting from instructions to commands
 }
-END_TEST
+EFL_END_TEST
 
 struct Filter_Test_Case {
    int l, r, t, b;
@@ -278,7 +278,7 @@ static struct Filter_Test_Case _test_cases[] = {
 
 static const int _test_cases_count = sizeof(_test_cases) / sizeof(_test_cases[0]);
 
-START_TEST(evas_filter_text_padding_test)
+EFL_START_TEST(evas_filter_text_padding_test)
 {
    START_FILTER_TEST();
    Evas_Coord x, y, w, h, W, H;
@@ -308,7 +308,7 @@ START_TEST(evas_filter_text_padding_test)
 
    END_FILTER_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* This will only check that all pixels are valid premultiplied values
  * and that they are not all zero.
@@ -344,7 +344,7 @@ _ecore_evas_pixels_check(Ecore_Evas *ee)
    return nonzero;
 }
 
-START_TEST(evas_filter_text_render_test)
+EFL_START_TEST(evas_filter_text_render_test)
 {
    Evas_Filter_Program *pgm;
 
@@ -408,7 +408,7 @@ START_TEST(evas_filter_text_render_test)
      }
 
 }
-END_TEST
+EFL_END_TEST
 
 static inline Eina_Bool
 strequal(const char *a, const char *b)
@@ -418,7 +418,7 @@ strequal(const char *a, const char *b)
    return !strcmp(a, b);
 }
 
-START_TEST(evas_filter_state_test)
+EFL_START_TEST(evas_filter_state_test)
 {
    /* dumb code testing state values */
    static const char *code =
@@ -458,7 +458,7 @@ START_TEST(evas_filter_state_test)
 
    END_FILTER_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 void evas_test_filters(TCase *tc)
 {
diff --git a/src/tests/evas/evas_test_image.c b/src/tests/evas/evas_test_image.c
index 392084145a..cdd7bff03d 100644
--- a/src/tests/evas/evas_test_image.c
+++ b/src/tests/evas/evas_test_image.c
@@ -51,7 +51,7 @@ static const char *exts[] = {
 #endif
 };
 
-START_TEST(evas_object_image_loader)
+EFL_START_TEST(evas_object_image_loader)
 {
    Evas *e = _setup_evas();
    Evas_Object *o;
@@ -89,7 +89,7 @@ START_TEST(evas_object_image_loader)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
 typedef struct _Orientation_Test_Res Orientation_Test_Res;
 struct _Orientation_Test_Res {
@@ -236,7 +236,7 @@ static int _compare_img_transverse(const uint32_t *d1, const uint32_t *d2, int w
    return 0;
 }
 
-START_TEST(evas_object_image_loader_orientation)
+EFL_START_TEST(evas_object_image_loader_orientation)
 {
    Evas *e = _setup_evas();
    Evas_Object *orig, *rot;
@@ -284,9 +284,9 @@ START_TEST(evas_object_image_loader_orientation)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(evas_object_image_orient)
+EFL_START_TEST(evas_object_image_orient)
 {
    Evas *e = _setup_evas();
    Evas_Object *orig;
@@ -334,10 +334,10 @@ START_TEST(evas_object_image_orient)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
 #ifdef BUILD_LOADER_TGV
-START_TEST(evas_object_image_tgv_loader_data)
+EFL_START_TEST(evas_object_image_tgv_loader_data)
 {
    Evas *e = _setup_evas();
    Evas_Object *obj, *ref;
@@ -392,10 +392,10 @@ START_TEST(evas_object_image_tgv_loader_data)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 #endif
 
-START_TEST(evas_object_image_all_loader_data)
+EFL_START_TEST(evas_object_image_all_loader_data)
 {
    Evas *e = _setup_evas();
    Evas_Object *obj, *ref;
@@ -462,13 +462,13 @@ START_TEST(evas_object_image_all_loader_data)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
 const char *buggy[] = {
   "BMP301K"
 };
 
-START_TEST(evas_object_image_buggy)
+EFL_START_TEST(evas_object_image_buggy)
 {
    Evas *e = _setup_evas();
    Evas_Object *obj, *ref;
@@ -523,7 +523,7 @@ START_TEST(evas_object_image_buggy)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
 static void check_rotate_region(Evas_Image_Orient orientation, int *r_x, int *r_y, int *r_w, int *r_h, int w, int h)
 {
@@ -579,7 +579,7 @@ static void check_rotate_region(Evas_Image_Orient orientation, int *r_x, int *r_
 }
 
 
-START_TEST(evas_object_image_partially_load_orientation)
+EFL_START_TEST(evas_object_image_partially_load_orientation)
 {
    static const Orientation_Test_Res res[] = {
      { TESTS_IMG_DIR"/Light_exif.jpg", "Original", EVAS_IMAGE_ORIENT_NONE, _compare_img },
@@ -634,9 +634,9 @@ START_TEST(evas_object_image_partially_load_orientation)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(evas_object_image_defaults)
+EFL_START_TEST(evas_object_image_defaults)
 {
    Evas *e = _setup_evas();
    Evas_Object *o;
@@ -661,10 +661,10 @@ START_TEST(evas_object_image_defaults)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
 // FIXME: belongs to another file
-START_TEST(evas_object_image_map_unmap)
+EFL_START_TEST(evas_object_image_map_unmap)
 {
    Evas *e = _setup_evas();
    Evas_Object *o, *o2;
@@ -825,10 +825,10 @@ START_TEST(evas_object_image_map_unmap)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
 #if BUILD_LOADER_JP2K
-START_TEST(evas_object_image_jp2k_loader_data)
+EFL_START_TEST(evas_object_image_jp2k_loader_data)
 {
    Evas *e = _setup_evas();
    Evas_Object *obj, *ref;
@@ -877,7 +877,7 @@ START_TEST(evas_object_image_jp2k_loader_data)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 #endif
 
 void evas_test_image_object(TCase *tc)
diff --git a/src/tests/evas/evas_test_init.c b/src/tests/evas/evas_test_init.c
index 827798f3ef..3b17752745 100644
--- a/src/tests/evas/evas_test_init.c
+++ b/src/tests/evas/evas_test_init.c
@@ -8,10 +8,10 @@
 
 #include "evas_suite.h"
 
-START_TEST(evas_simple)
+EFL_START_TEST(evas_simple)
 {
 }
-END_TEST
+EFL_END_TEST
 
 void evas_test_init(TCase *tc)
 {
diff --git a/src/tests/evas/evas_test_mask.c b/src/tests/evas/evas_test_mask.c
index 56b12e811e..850c4c86ae 100644
--- a/src/tests/evas/evas_test_mask.c
+++ b/src/tests/evas/evas_test_mask.c
@@ -57,7 +57,7 @@ _bgra_compare(unsigned int *data, unsigned int *ref, int w, int h)
 }
 
 // The usual useless unit test
-START_TEST(evas_mask_test_setget)
+EFL_START_TEST(evas_mask_test_setget)
 {
    Evas *e = _setup_evas();
    Evas_Object *obj = NULL, *mask = NULL;
@@ -101,10 +101,10 @@ START_TEST(evas_mask_test_setget)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
 // This test is also very basic but will check the pixels
-START_TEST(evas_mask_test_compare_clip)
+EFL_START_TEST(evas_mask_test_compare_clip)
 {
    Evas_Object *obj, *mask, *rect, *bg, *clip, *text;
    unsigned int *data, *refdata[3];
@@ -250,10 +250,10 @@ START_TEST(evas_mask_test_compare_clip)
    free(data);
    END_MASK_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 // This will simply check that a mask is recursively applied to children
-START_TEST(evas_mask_test_mask_of_mask)
+EFL_START_TEST(evas_mask_test_mask_of_mask)
 {
    Evas_Object *bg, *tbl, *rect0, *mask0, *mask1, *obj;
    unsigned int *data, *refdata;
@@ -372,7 +372,7 @@ START_TEST(evas_mask_test_mask_of_mask)
    free(data);
    END_MASK_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 // NOTE: Much more extensive tests are required. But they should
 // be based on "exactness" or a pixel similarity tool.
diff --git a/src/tests/evas/evas_test_matrix.c b/src/tests/evas/evas_test_matrix.c
index e8fb89185d..0f0fb2e4bc 100644
--- a/src/tests/evas/evas_test_matrix.c
+++ b/src/tests/evas/evas_test_matrix.c
@@ -13,7 +13,7 @@
 #include "evas_suite.h"
 #include "evas_tests_helpers.h"
 
-START_TEST(evas_matrix)
+EFL_START_TEST(evas_matrix)
 {
    Eina_Vector3 position;
    Eina_Quaternion orientation;
@@ -33,7 +33,7 @@ START_TEST(evas_matrix)
    fail_if((mat.xx - 0.99 < DBL_EPSILON) || (mat.xy - 0.0 < DBL_EPSILON) ||
            (mat.yx -0.0 < DBL_EPSILON) || (mat.yy -0.49 < DBL_EPSILON));
 }
-END_TEST
+EFL_END_TEST
 
 void evas_test_matrix(TCase *tc)
 {
diff --git a/src/tests/evas/evas_test_mesh.c b/src/tests/evas/evas_test_mesh.c
index 51a29a5dfe..24ca961bd2 100644
--- a/src/tests/evas/evas_test_mesh.c
+++ b/src/tests/evas/evas_test_mesh.c
@@ -128,7 +128,7 @@ static int _compare_meshes(Evas_Canvas3D_Mesh *mesh1, Evas_Canvas3D_Mesh *mesh2)
    return 0;
 }
 
-START_TEST(evas_object_mesh_loader_saver)
+EFL_START_TEST(evas_object_mesh_loader_saver)
 {
    char buffer[PATH_MAX];
    Evas *e = _setup_evas();
@@ -155,7 +155,7 @@ START_TEST(evas_object_mesh_loader_saver)
    evas_free(e);
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
 void evas_test_mesh(TCase *tc)
 {
diff --git a/src/tests/evas/evas_test_object.c b/src/tests/evas/evas_test_object.c
index 70e5d40f05..076bf69b74 100644
--- a/src/tests/evas/evas_test_object.c
+++ b/src/tests/evas/evas_test_object.c
@@ -9,7 +9,7 @@
 #include "evas_suite.h"
 #include "evas_tests_helpers.h"
 
-START_TEST(evas_object_various)
+EFL_START_TEST(evas_object_various)
 {
    Evas *evas = EVAS_TEST_INIT_EVAS();
 
@@ -29,7 +29,7 @@ START_TEST(evas_object_various)
    ecore_evas_shutdown();
    ecore_evas_shutdown();
 }
-END_TEST
+EFL_END_TEST
 
 void evas_test_object(TCase *tc)
 {
diff --git a/src/tests/evas/evas_test_object_smart.c b/src/tests/evas/evas_test_object_smart.c
index 648402a12f..080c985368 100644
--- a/src/tests/evas/evas_test_object_smart.c
+++ b/src/tests/evas/evas_test_object_smart.c
@@ -94,7 +94,7 @@ do \
 } \
 while (0)
 
-START_TEST(evas_object_smart_paragraph_direction)
+EFL_START_TEST(evas_object_smart_paragraph_direction)
 {
    START_EVAS_OBJECT_SMART_TEST();
 
@@ -174,7 +174,7 @@ START_TEST(evas_object_smart_paragraph_direction)
    DELETE_EVAS_TEXT();
    END_EVAS_OBJECT_SMART_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 void evas_test_object_smart(TCase *tc)
 {
diff --git a/src/tests/evas/evas_test_render_engines.c b/src/tests/evas/evas_test_render_engines.c
index 99f2955ce6..6e9aef730a 100644
--- a/src/tests/evas/evas_test_render_engines.c
+++ b/src/tests/evas/evas_test_render_engines.c
@@ -48,7 +48,7 @@ static const char *built_engines[] = {
   NULL
 };
 
-START_TEST(evas_render_engines)
+EFL_START_TEST(evas_render_engines)
 {
    Eina_List *lst = evas_render_method_list();
    const char **itr;
@@ -61,9 +61,9 @@ START_TEST(evas_render_engines)
 
    evas_render_method_list_free(lst);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(evas_render_lookup)
+EFL_START_TEST(evas_render_lookup)
 {
    const char **itr;
 
@@ -73,7 +73,7 @@ START_TEST(evas_render_lookup)
         fail_if(id == 0, "could not load engine: %s", *itr);
      }
 }
-END_TEST
+EFL_END_TEST
 
 void evas_test_render_engines(TCase *tc)
 {
diff --git a/src/tests/evas/evas_test_text.c b/src/tests/evas/evas_test_text.c
index c279d5571c..10368f6fc0 100644
--- a/src/tests/evas/evas_test_text.c
+++ b/src/tests/evas/evas_test_text.c
@@ -37,7 +37,7 @@ do \
 } \
 while (0)
 
-START_TEST(evas_text_simple)
+EFL_START_TEST(evas_text_simple)
 {
    START_TEXT_TEST();
    const char *buf = "Test - בדיקה";
@@ -45,10 +45,10 @@ START_TEST(evas_text_simple)
    fail_if(strcmp(evas_object_text_text_get(to), buf));
    END_TEXT_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Various text related geometries */
-START_TEST(evas_text_geometries)
+EFL_START_TEST(evas_text_geometries)
 {
    START_TEXT_TEST();
    const char *buf = "Tests";
@@ -162,10 +162,10 @@ START_TEST(evas_text_geometries)
 
    END_TEXT_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Various evas stuff, such as scale */
-START_TEST(evas_text_evas)
+EFL_START_TEST(evas_text_evas)
 {
    Evas_Coord w, h, bw, bh;
    START_TEXT_TEST();
@@ -186,7 +186,7 @@ START_TEST(evas_text_evas)
 
    END_TEXT_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 static void
 _test_ellipsis(Evas_Object *to, const char *buf, const char *font, Evas_Font_Size size, double ellipsis)
@@ -223,7 +223,7 @@ _test_ellipsis(Evas_Object *to, const char *buf, const char *font, Evas_Font_Siz
    fail_if(w < 100);
 }
 
-START_TEST(evas_text_ellipsis)
+EFL_START_TEST(evas_text_ellipsis)
 {
    START_TEXT_TEST();
    const char *buf = "נסיון בלה בלה בלה בלה";
@@ -270,11 +270,11 @@ START_TEST(evas_text_ellipsis)
 
    END_TEXT_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Tests for functions that are in evas_object_text.c but
  * don't really have anything to do with it. */
-START_TEST(evas_text_unrelated)
+EFL_START_TEST(evas_text_unrelated)
 {
    START_TEXT_TEST();
    const char *buf = "נסיון";
@@ -293,7 +293,7 @@ START_TEST(evas_text_unrelated)
 
    END_TEXT_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 #define _CHECK_SET_GET(x) \
 do \
@@ -309,7 +309,7 @@ do \
 } \
 while (0)
 
-START_TEST(evas_text_set_get)
+EFL_START_TEST(evas_text_set_get)
 {
    START_TEXT_TEST();
    const char *buf = "Test - בדיקה";
@@ -413,9 +413,9 @@ START_TEST(evas_text_set_get)
 
    END_TEXT_TEST();
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(evas_text_style)
+EFL_START_TEST(evas_text_style)
 {
    Evas_Coord l, r, t, b;
    START_TEXT_TEST();
@@ -464,10 +464,10 @@ START_TEST(evas_text_style)
    fail_if(strcmp(evas_object_text_text_get(to), buf));
    END_TEXT_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 #ifdef HAVE_FRIBIDI
-START_TEST(evas_text_bidi)
+EFL_START_TEST(evas_text_bidi)
 {
    START_TEXT_TEST();
    const char *buf = "Test - בדיקה";
@@ -625,10 +625,10 @@ START_TEST(evas_text_bidi)
 
    END_TEXT_TEST();
 }
-END_TEST
+EFL_END_TEST
 #endif
 
-START_TEST(evas_text_render)
+EFL_START_TEST(evas_text_render)
 {
    Ecore_Evas *ee = ecore_evas_buffer_new(500, 500);
    Evas *evas = ecore_evas_get(ee);
@@ -654,9 +654,9 @@ START_TEST(evas_text_render)
 
    ecore_evas_free(ee);
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(evas_text_font_load)
+EFL_START_TEST(evas_text_font_load)
 {
    Ecore_Evas *ee = ecore_evas_buffer_new(500, 500);
    Evas *evas = ecore_evas_get(ee);
@@ -680,7 +680,7 @@ START_TEST(evas_text_font_load)
 
    ecore_evas_free(ee);
 }
-END_TEST
+EFL_END_TEST
 
 void evas_test_text(TCase *tc)
 {
diff --git a/src/tests/evas/evas_test_textblock.c b/src/tests/evas/evas_test_textblock.c
index 14d04a7e10..451e34f5ac 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -62,7 +62,7 @@ do \
 } \
 while (0)
 
-START_TEST(evas_textblock_simple)
+EFL_START_TEST(evas_textblock_simple)
 {
    START_TB_TEST();
    const char *buf = "Th<i>i</i>s is a <br/> te<b>s</b>t.";
@@ -78,7 +78,7 @@ START_TEST(evas_textblock_simple)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 #define _CHECK_CURSOR_COORDS() \
 do \
@@ -101,7 +101,7 @@ do \
         fail_if(ret == -1); \
 } \
 while (0)
-START_TEST(evas_textblock_cursor)
+EFL_START_TEST(evas_textblock_cursor)
 {
    START_TB_TEST();
    Evas_Coord x, y, w, h;
@@ -974,10 +974,10 @@ START_TEST(evas_textblock_cursor)
      }
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 #ifdef HAVE_FRIBIDI
-START_TEST(evas_textblock_split_cursor)
+EFL_START_TEST(evas_textblock_split_cursor)
 {
    START_TB_TEST();
    Evas_Coord x, w, x2, w2;
@@ -1292,10 +1292,10 @@ START_TEST(evas_textblock_split_cursor)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 #endif
 
-START_TEST(evas_textblock_format_removal)
+EFL_START_TEST(evas_textblock_format_removal)
 {
    START_TB_TEST();
    int i;
@@ -1721,10 +1721,10 @@ START_TEST(evas_textblock_format_removal)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Testing items */
-START_TEST(evas_textblock_items)
+EFL_START_TEST(evas_textblock_items)
 {
    Evas_Coord x, y, w, h, w2, h2, nw, nh, ih;
    START_TB_TEST();
@@ -1854,10 +1854,10 @@ START_TEST(evas_textblock_items)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Wrapping tests */
-START_TEST(evas_textblock_wrapping)
+EFL_START_TEST(evas_textblock_wrapping)
 {
    Evas_Coord bw, bh, w, h, nw, nh;
    int i;
@@ -2293,10 +2293,10 @@ START_TEST(evas_textblock_wrapping)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Various textblock stuff */
-START_TEST(evas_textblock_various)
+EFL_START_TEST(evas_textblock_various)
 {
    Evas_Coord w, h, bw, bh;
    START_TB_TEST();
@@ -2408,10 +2408,10 @@ START_TEST(evas_textblock_various)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Various geometries. e.g. range geometry. */
-START_TEST(evas_textblock_geometries)
+EFL_START_TEST(evas_textblock_geometries)
 {
    START_TB_TEST();
    const char *buf = "This is a <br/> test.";
@@ -2891,10 +2891,10 @@ START_TEST(evas_textblock_geometries)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Should handle all the text editing. */
-START_TEST(evas_textblock_editing)
+EFL_START_TEST(evas_textblock_editing)
 {
    START_TB_TEST();
    const char *buf = "First par.<ps/>Second par.";
@@ -3019,10 +3019,10 @@ START_TEST(evas_textblock_editing)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Text getters */
-START_TEST(evas_textblock_text_getters)
+EFL_START_TEST(evas_textblock_text_getters)
 {
    START_TB_TEST();
    const char *buf = "This is a <br/> test.<ps/>"
@@ -3247,10 +3247,10 @@ START_TEST(evas_textblock_text_getters)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Formats */
-START_TEST(evas_textblock_formats)
+EFL_START_TEST(evas_textblock_formats)
 {
    START_TB_TEST();
    const char *buf = "Th<b>i<font_size=15 wrap=none>s i</font_size=13>s</> a <br/> te<ps/>st<item></>.";
@@ -3552,10 +3552,10 @@ START_TEST(evas_textblock_formats)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Different text styles, for example, shadow. */
-START_TEST(evas_textblock_style)
+EFL_START_TEST(evas_textblock_style)
 {
    Evas_Coord w, h, nw, nh;
    Evas_Coord l, r, t, b;
@@ -3704,10 +3704,10 @@ START_TEST(evas_textblock_style)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Various setters and getters */
-START_TEST(evas_textblock_set_get)
+EFL_START_TEST(evas_textblock_set_get)
 {
    START_TB_TEST();
    const char *buf = "";
@@ -3748,10 +3748,10 @@ START_TEST(evas_textblock_set_get)
    evas_font_hinting_set(evas, EVAS_FONT_HINTING_BYTECODE);
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* Aux evas stuff, such as scale. */
-START_TEST(evas_textblock_evas)
+EFL_START_TEST(evas_textblock_evas)
 {
    Evas_Coord w, h, sw, sh;
    START_TB_TEST();
@@ -3768,10 +3768,10 @@ START_TEST(evas_textblock_evas)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 /* All the string escaping stuff */
-START_TEST(evas_textblock_escaping)
+EFL_START_TEST(evas_textblock_escaping)
 {
    int len;
    START_TB_TEST();
@@ -3807,9 +3807,9 @@ START_TEST(evas_textblock_escaping)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(evas_textblock_size)
+EFL_START_TEST(evas_textblock_size)
 {
    START_TB_TEST();
    Evas_Coord w, h, h2, nw, nh;
@@ -3923,9 +3923,9 @@ START_TEST(evas_textblock_size)
    /* FIXME: There is a lot more to be done. */
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
-START_TEST(evas_textblock_delete)
+EFL_START_TEST(evas_textblock_delete)
 {
    START_TB_TEST();
    const Evas_Object_Textblock_Node_Format *fmt;
@@ -3959,7 +3959,7 @@ START_TEST(evas_textblock_delete)
 
    END_TB_TEST();
 }
-END_TEST;
+EFL_END_TEST;
 
 /* Runs x,y in [from,to] range */
 static void
@@ -3984,7 +3984,7 @@ _obstacle_run(Evas_Object *tb, Evas_Object *obj,
      }
 }
 
-START_TEST(evas_textblock_obstacle)
+EFL_START_TEST(evas_textblock_obstacle)
 {
    START_TB_TEST();
    Evas_Coord fw, fh;
@@ -4043,7 +4043,7 @@ START_TEST(evas_textblock_obstacle)
    _obstacle_run(tb, rect3, 0, fw, 0, 0, fh);
    END_TB_TEST();
 }
-END_TEST;
+EFL_END_TEST;
 
 #ifdef HAVE_HYPHEN
 static void
@@ -4067,7 +4067,7 @@ _hyphenation_width_stress(Evas_Object *tb, Evas_Textblock_Cursor *cur)
    ck_assert_int_eq(w, bw);
 }
 
-START_TEST(evas_textblock_hyphenation)
+EFL_START_TEST(evas_textblock_hyphenation)
 {
    START_TB_TEST();
    Evas_Coord w, fw;
@@ -4129,10 +4129,10 @@ START_TEST(evas_textblock_hyphenation)
 
    END_TB_TEST();
 }
-END_TEST;
+EFL_END_TEST;
 #endif
 
-START_TEST(evas_textblock_text_iface)
+EFL_START_TEST(evas_textblock_text_iface)
 {
    START_TB_TEST();
    Evas_Coord nw, nh;
@@ -4202,7 +4202,7 @@ START_TEST(evas_textblock_text_iface)
 
    END_TB_TEST();
 }
-END_TEST;
+EFL_END_TEST;
 
 static void
 _test_check_annotation(Evas_Object *tb,
@@ -4246,7 +4246,7 @@ _test_check_annotation(Evas_Object *tb,
 #define _CREATE_PARAMS(X) (sizeof(X) / sizeof(X[0])), (X)
 #define _COMP_PARAMS(...) _CREATE_PARAMS(_COMP_STR(__VA_ARGS__))
 
-START_TEST(evas_textblock_annotation)
+EFL_START_TEST(evas_textblock_annotation)
 {
    START_TB_TEST();
    Efl_Text_Annotate_Annotation *an, *an2;
@@ -4428,9 +4428,9 @@ START_TEST(evas_textblock_annotation)
 
    END_TB_TEST();
 }
-END_TEST;
+EFL_END_TEST;
 
-START_TEST(efl_canvas_text_cursor)
+EFL_START_TEST(efl_canvas_text_cursor)
 {
    START_TB_TEST();
 
@@ -4461,7 +4461,7 @@ START_TEST(efl_canvas_text_cursor)
 
    END_TB_TEST();
 }
-END_TEST
+EFL_END_TEST
 
 void evas_test_textblock(TCase *tc)
 {