summaryrefslogtreecommitdiff
path: root/src/tests/eio
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-03-26 14:19:28 -0400
committerStefan Schmidt <stefan@osg.samsung.com>2018-04-05 11:10:25 +0200
commitadc601aca2f0a16784af36bf6ae7dd20eeb33202 (patch)
treecac0a78fa40e88abb028b06d985c28bf89da269c /src/tests/eio
parentb340b5e49ccae48a7d5adbbfa301af39e232348c (diff)
tests: add instrumentation to existing tests to find slow tests
efl_check.h must be included and the EFL_START/END_TEST macros must be used in place of normal START/END_TEST macros timing is enabled when TIMING_ENABLED is set https://phab.enlightenment.org/w/improve_tests/ Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Diffstat (limited to 'src/tests/eio')
-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
11 files changed, 115 insertions, 116 deletions
diff --git a/src/tests/eio/eio_model_test_file.c b/src/tests/eio/eio_model_test_file.c
index 81ab19d2c7..253ef8f0a0 100644
--- a/src/tests/eio/eio_model_test_file.c
+++ b/src/tests/eio/eio_model_test_file.c
@@ -10,8 +10,7 @@
10#include <Efl.h> 10#include <Efl.h>
11#include <stdio.h> 11#include <stdio.h>
12 12
13#include <check.h> 13#include "eio_suite.h"
14
15#define EFL_MODEL_TEST_FILENAME_PATH "/tmp" 14#define EFL_MODEL_TEST_FILENAME_PATH "/tmp"
16#define EFL_MODEL_MAX_TEST_CHILDS 16 15#define EFL_MODEL_MAX_TEST_CHILDS 16
17 16
@@ -103,7 +102,7 @@ error_promise_then(void* data EINA_UNUSED, Efl_Event const* event EINA_UNUSED)
103 ecore_main_loop_quit(); 102 ecore_main_loop_quit();
104} 103}
105 104
106START_TEST(eio_model_test_test_file) 105EFL_START_TEST(eio_model_test_test_file)
107{ 106{
108 Eo *filemodel = NULL; 107 Eo *filemodel = NULL;
109 108
@@ -147,7 +146,7 @@ START_TEST(eio_model_test_test_file)
147 ecore_shutdown(); 146 ecore_shutdown();
148 eina_shutdown(); 147 eina_shutdown();
149} 148}
150END_TEST 149EFL_END_TEST
151 150
152void 151void
153eio_model_test_file(TCase *tc) 152eio_model_test_file(TCase *tc)
diff --git a/src/tests/eio/eio_model_test_monitor_add.c b/src/tests/eio/eio_model_test_monitor_add.c
index e6b14d57b8..fe3cdc2ba1 100644
--- a/src/tests/eio/eio_model_test_monitor_add.c
+++ b/src/tests/eio/eio_model_test_monitor_add.c
@@ -10,7 +10,7 @@
10#include <Efl.h> 10#include <Efl.h>
11#include <stdio.h> 11#include <stdio.h>
12 12
13#include <check.h> 13#include "eio_suite.h"
14 14
15Eina_Tmpstr* temp_filename = NULL; 15Eina_Tmpstr* temp_filename = NULL;
16const char* tmpdir = NULL; 16const char* tmpdir = NULL;
@@ -101,7 +101,7 @@ _create_file_error(void *data EINA_UNUSED, Efl_Event const* event EINA_UNUSED)
101 ecore_main_loop_quit(); 101 ecore_main_loop_quit();
102} 102}
103 103
104START_TEST(eio_model_test_test_monitor_add) 104EFL_START_TEST(eio_model_test_test_monitor_add)
105{ 105{
106 Eo *filemodel = NULL; 106 Eo *filemodel = NULL;
107 107
@@ -133,7 +133,7 @@ START_TEST(eio_model_test_test_monitor_add)
133 133
134 fail_if(!children_deleted); 134 fail_if(!children_deleted);
135} 135}
136END_TEST 136EFL_END_TEST
137 137
138void 138void
139eio_model_test_monitor_add(TCase *tc) 139eio_model_test_monitor_add(TCase *tc)
diff --git a/src/tests/eio/eio_suite.h b/src/tests/eio/eio_suite.h
index 83f0303f6a..4f66cbc86b 100644
--- a/src/tests/eio/eio_suite.h
+++ b/src/tests/eio/eio_suite.h
@@ -2,7 +2,7 @@
2#define _EIO_SUITE_H 2#define _EIO_SUITE_H
3 3
4#include <check.h> 4#include <check.h>
5 5#include "../efl_check.h"
6void eio_test_monitor(TCase *tc); 6void eio_test_monitor(TCase *tc);
7void eio_test_sentry(TCase *tc); 7void eio_test_sentry(TCase *tc);
8void eio_model_test_file(TCase *tc); 8void eio_model_test_file(TCase *tc);
diff --git a/src/tests/eio/eio_test_eet.c b/src/tests/eio/eio_test_eet.c
index 47f3ff1e99..bfdddcf553 100644
--- a/src/tests/eio/eio_test_eet.c
+++ b/src/tests/eio/eio_test_eet.c
@@ -65,7 +65,7 @@ _eet_error_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, Eet_Error e
65 ecore_main_loop_quit(); 65 ecore_main_loop_quit();
66} 66}
67 67
68START_TEST(eio_test_eet_cipher_decipher) 68EFL_START_TEST(eio_test_eet_cipher_decipher)
69{ 69{
70 int ret; 70 int ret;
71 char *data = "This is the data to save in file"; 71 char *data = "This is the data to save in file";
@@ -111,7 +111,7 @@ START_TEST(eio_test_eet_cipher_decipher)
111 eet_shutdown(); 111 eet_shutdown();
112 ecore_shutdown(); 112 ecore_shutdown();
113} 113}
114END_TEST 114EFL_END_TEST
115 115
116typedef struct 116typedef struct
117{ 117{
@@ -159,7 +159,7 @@ _data_read_done_cb(void *data, Eio_File *handler EINA_UNUSED, void *decoded)
159 ecore_main_loop_quit(); 159 ecore_main_loop_quit();
160} 160}
161 161
162START_TEST(eio_test_eet_data_cipher_decipher) 162EFL_START_TEST(eio_test_eet_data_cipher_decipher)
163{ 163{
164 int ret; 164 int ret;
165 const char *key = "This is a secret key"; 165 const char *key = "This is a secret key";
@@ -208,7 +208,7 @@ START_TEST(eio_test_eet_data_cipher_decipher)
208 eet_shutdown(); 208 eet_shutdown();
209 ecore_shutdown(); 209 ecore_shutdown();
210} 210}
211END_TEST 211EFL_END_TEST
212 212
213void 213void
214eio_test_eet(TCase *tc) 214eio_test_eet(TCase *tc)
diff --git a/src/tests/eio/eio_test_file.c b/src/tests/eio/eio_test_file.c
index b9eedefb96..d6a375a331 100644
--- a/src/tests/eio/eio_test_file.c
+++ b/src/tests/eio/eio_test_file.c
@@ -115,7 +115,7 @@ _open_done_cb(void *data, Eio_File *handler EINA_UNUSED, Eina_File *file)
115 ecore_main_loop_quit(); 115 ecore_main_loop_quit();
116} 116}
117 117
118START_TEST(eio_file_test_ls) 118EFL_START_TEST(eio_file_test_ls)
119{ 119{
120 int number_of_listed_files = 0, ret; 120 int number_of_listed_files = 0, ret;
121 const char *new_dir = "new_dir"; 121 const char *new_dir = "new_dir";
@@ -192,9 +192,9 @@ START_TEST(eio_file_test_ls)
192 eio_shutdown(); 192 eio_shutdown();
193 ecore_shutdown(); 193 ecore_shutdown();
194} 194}
195END_TEST 195EFL_END_TEST
196 196
197START_TEST(eio_file_test_file) 197EFL_START_TEST(eio_file_test_file)
198{ 198{
199 int number_of_listed_files = 0, ret; 199 int number_of_listed_files = 0, ret;
200 Eina_Bool is_dir; 200 Eina_Bool is_dir;
@@ -307,9 +307,9 @@ START_TEST(eio_file_test_file)
307 eio_shutdown(); 307 eio_shutdown();
308 ecore_shutdown(); 308 ecore_shutdown();
309} 309}
310END_TEST 310EFL_END_TEST
311 311
312START_TEST(eio_file_test_open) 312EFL_START_TEST(eio_file_test_open)
313{ 313{
314 Eina_Bool opened_file; 314 Eina_Bool opened_file;
315 int ret; 315 int ret;
@@ -344,7 +344,7 @@ START_TEST(eio_file_test_open)
344 eio_shutdown(); 344 eio_shutdown();
345 ecore_shutdown(); 345 ecore_shutdown();
346} 346}
347END_TEST 347EFL_END_TEST
348 348
349void 349void
350eio_test_file(TCase *tc) 350eio_test_file(TCase *tc)
diff --git a/src/tests/eio/eio_test_manager.c b/src/tests/eio/eio_test_manager.c
index 2e396c1ad6..a9d5ecc020 100644
--- a/src/tests/eio/eio_test_manager.c
+++ b/src/tests/eio/eio_test_manager.c
@@ -183,7 +183,7 @@ _test_ls(Efl_Future *(*func)(Eo *obj, const char *path, Eina_Bool recursive),
183 efl_del(job); 183 efl_del(job);
184} 184}
185 185
186START_TEST(efl_io_manager_test_stat) 186EFL_START_TEST(efl_io_manager_test_stat)
187{ 187{
188 Eina_Tmpstr *test_dirname; 188 Eina_Tmpstr *test_dirname;
189 Eina_Tmpstr *nested_dirname; 189 Eina_Tmpstr *nested_dirname;
@@ -231,9 +231,9 @@ START_TEST(efl_io_manager_test_stat)
231 eio_shutdown(); 231 eio_shutdown();
232 ecore_shutdown(); 232 ecore_shutdown();
233} 233}
234END_TEST 234EFL_END_TEST
235 235
236START_TEST(efl_io_manager_test_ls) 236EFL_START_TEST(efl_io_manager_test_ls)
237{ 237{
238 Eina_Tmpstr *test_dirname; 238 Eina_Tmpstr *test_dirname;
239 Eina_Tmpstr *nested_dirname; 239 Eina_Tmpstr *nested_dirname;
@@ -286,9 +286,9 @@ START_TEST(efl_io_manager_test_ls)
286 eio_shutdown(); 286 eio_shutdown();
287 ecore_shutdown(); 287 ecore_shutdown();
288} 288}
289END_TEST 289EFL_END_TEST
290 290
291START_TEST(efl_io_manager_test_open) 291EFL_START_TEST(efl_io_manager_test_open)
292{ 292{
293 Eina_Tmpstr *test_dirname; 293 Eina_Tmpstr *test_dirname;
294 Eina_Tmpstr *nested_dirname; 294 Eina_Tmpstr *nested_dirname;
@@ -332,9 +332,9 @@ START_TEST(efl_io_manager_test_open)
332 eina_shutdown(); 332 eina_shutdown();
333 ecore_shutdown(); 333 ecore_shutdown();
334} 334}
335END_TEST 335EFL_END_TEST
336 336
337START_TEST(efl_io_instantiated) 337EFL_START_TEST(efl_io_instantiated)
338{ 338{
339 Efl_Io_Manager *manager; 339 Efl_Io_Manager *manager;
340 340
@@ -352,7 +352,7 @@ START_TEST(efl_io_instantiated)
352 352
353 ecore_shutdown(); 353 ecore_shutdown();
354} 354}
355END_TEST 355EFL_END_TEST
356 356
357void 357void
358eio_test_job(TCase *tc) 358eio_test_job(TCase *tc)
diff --git a/src/tests/eio/eio_test_manager_xattr.c b/src/tests/eio/eio_test_manager_xattr.c
index 136ae4dc16..e3e98f6808 100644
--- a/src/tests/eio/eio_test_manager_xattr.c
+++ b/src/tests/eio/eio_test_manager_xattr.c
@@ -117,7 +117,7 @@ _future_all_cb(void *data,
117 return array; 117 return array;
118} 118}
119 119
120START_TEST(eio_test_job_xattr_set) 120EFL_START_TEST(eio_test_job_xattr_set)
121{ 121{
122 char *filename = "eio-tmpfile"; 122 char *filename = "eio-tmpfile";
123 Eina_Tmpstr *test_file_path; 123 Eina_Tmpstr *test_file_path;
@@ -192,7 +192,7 @@ START_TEST(eio_test_job_xattr_set)
192 eina_shutdown(); 192 eina_shutdown();
193 ecore_shutdown(); 193 ecore_shutdown();
194} 194}
195END_TEST 195EFL_END_TEST
196 196
197void eio_test_job_xattr(TCase *tc) 197void eio_test_job_xattr(TCase *tc)
198{ 198{
diff --git a/src/tests/eio/eio_test_map.c b/src/tests/eio/eio_test_map.c
index 7dbd50d5f4..0c4dc859ab 100644
--- a/src/tests/eio/eio_test_map.c
+++ b/src/tests/eio/eio_test_map.c
@@ -53,7 +53,7 @@ _error_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, int error)
53 ecore_main_loop_quit(); 53 ecore_main_loop_quit();
54} 54}
55 55
56START_TEST(eio_test_map_simple) 56EFL_START_TEST(eio_test_map_simple)
57{ 57{
58 int fd; 58 int fd;
59 const char *file = "eio_map_exampleXXXXXX.txt"; 59 const char *file = "eio_map_exampleXXXXXX.txt";
@@ -93,7 +93,7 @@ START_TEST(eio_test_map_simple)
93 eina_shutdown(); 93 eina_shutdown();
94 ecore_shutdown(); 94 ecore_shutdown();
95} 95}
96END_TEST 96EFL_END_TEST
97 97
98void 98void
99eio_test_map(TCase *tc) 99eio_test_map(TCase *tc)
diff --git a/src/tests/eio/eio_test_monitor.c b/src/tests/eio/eio_test_monitor.c
index b05824165c..017609b9f3 100644
--- a/src/tests/eio/eio_test_monitor.c
+++ b/src/tests/eio/eio_test_monitor.c
@@ -133,7 +133,7 @@ static void _common_shutdown(Eina_Tmpstr *dirname)
133 133
134/////// tests monitoring a directory 134/////// tests monitoring a directory
135 135
136START_TEST(eio_test_monitor_add_and_remove) 136EFL_START_TEST(eio_test_monitor_add_and_remove)
137{ 137{
138 Eina_Tmpstr *dirname = _common_init(); 138 Eina_Tmpstr *dirname = _common_init();
139 Eina_Stringshare *filename; 139 Eina_Stringshare *filename;
@@ -154,9 +154,9 @@ START_TEST(eio_test_monitor_add_and_remove)
154 154
155 _common_shutdown(dirname); 155 _common_shutdown(dirname);
156} 156}
157END_TEST 157EFL_END_TEST
158 158
159START_TEST(eio_test_monitor_add_remove_add) 159EFL_START_TEST(eio_test_monitor_add_remove_add)
160{ 160{
161 Eina_Tmpstr *dirname = _common_init(); 161 Eina_Tmpstr *dirname = _common_init();
162 Eina_Stringshare *filename; 162 Eina_Stringshare *filename;
@@ -180,9 +180,9 @@ START_TEST(eio_test_monitor_add_remove_add)
180 180
181 _common_shutdown(dirname); 181 _common_shutdown(dirname);
182} 182}
183END_TEST 183EFL_END_TEST
184 184
185START_TEST(eio_test_monitor_add_add_remove_remove) 185EFL_START_TEST(eio_test_monitor_add_add_remove_remove)
186{ 186{
187 Eina_Tmpstr *dirname = _common_init(); 187 Eina_Tmpstr *dirname = _common_init();
188 Eina_Stringshare *filename1; 188 Eina_Stringshare *filename1;
@@ -207,7 +207,7 @@ START_TEST(eio_test_monitor_add_add_remove_remove)
207 207
208 _common_shutdown(dirname); 208 _common_shutdown(dirname);
209} 209}
210END_TEST 210EFL_END_TEST
211 211
212static void _file_created_cb(void *data, int type, void *event) 212static void _file_created_cb(void *data, int type, void *event)
213{ 213{
@@ -220,7 +220,7 @@ static void _file_created_cb(void *data, int type, void *event)
220} 220}
221 221
222 222
223START_TEST(eio_test_monitor_directory_file_created_notify) 223EFL_START_TEST(eio_test_monitor_directory_file_created_notify)
224{ 224{
225 Eina_Tmpstr *dirname = _common_init(); 225 Eina_Tmpstr *dirname = _common_init();
226 Eina_Stringshare *filename; 226 Eina_Stringshare *filename;
@@ -240,7 +240,7 @@ START_TEST(eio_test_monitor_directory_file_created_notify)
240 240
241 _common_shutdown(dirname); 241 _common_shutdown(dirname);
242} 242}
243END_TEST 243EFL_END_TEST
244 244
245struct { 245struct {
246 Eina_Stringshare *s; 246 Eina_Stringshare *s;
@@ -276,7 +276,7 @@ _multi_file_created_cb(void *data EINA_UNUSED, int type, void *event)
276 ecore_main_loop_quit(); 276 ecore_main_loop_quit();
277} 277}
278 278
279START_TEST(eio_test_monitor_directory_multi_file_created_notify) 279EFL_START_TEST(eio_test_monitor_directory_multi_file_created_notify)
280{ 280{
281 Eina_Tmpstr *dirname = _common_init(); 281 Eina_Tmpstr *dirname = _common_init();
282 282
@@ -299,7 +299,7 @@ START_TEST(eio_test_monitor_directory_multi_file_created_notify)
299 299
300 _common_shutdown(dirname); 300 _common_shutdown(dirname);
301} 301}
302END_TEST 302EFL_END_TEST
303 303
304static void _file_deleted_cb(void *data, int type, void *event) 304static void _file_deleted_cb(void *data, int type, void *event)
305{ 305{
@@ -311,7 +311,7 @@ static void _file_deleted_cb(void *data, int type, void *event)
311 } 311 }
312} 312}
313 313
314START_TEST(eio_test_monitor_directory_file_deleted_notify) 314EFL_START_TEST(eio_test_monitor_directory_file_deleted_notify)
315{ 315{
316 Eina_Tmpstr *dirname = _common_init(); 316 Eina_Tmpstr *dirname = _common_init();
317 Eina_Stringshare *filename; 317 Eina_Stringshare *filename;
@@ -332,7 +332,7 @@ START_TEST(eio_test_monitor_directory_file_deleted_notify)
332 332
333 _common_shutdown(dirname); 333 _common_shutdown(dirname);
334} 334}
335END_TEST 335EFL_END_TEST
336 336
337static void _file_modified_cb(void *data, int type, void *event) 337static void _file_modified_cb(void *data, int type, void *event)
338{ 338{
@@ -344,7 +344,7 @@ static void _file_modified_cb(void *data, int type, void *event)
344 } 344 }
345} 345}
346 346
347START_TEST(eio_test_monitor_directory_file_modified_notify) 347EFL_START_TEST(eio_test_monitor_directory_file_modified_notify)
348{ 348{
349 Eina_Tmpstr *dirname = _common_init(); 349 Eina_Tmpstr *dirname = _common_init();
350 Eina_Stringshare *filename; 350 Eina_Stringshare *filename;
@@ -366,7 +366,7 @@ START_TEST(eio_test_monitor_directory_file_modified_notify)
366 //cleanup 366 //cleanup
367 _common_shutdown(dirname); 367 _common_shutdown(dirname);
368} 368}
369END_TEST 369EFL_END_TEST
370 370
371static void _file_closed_cb(void *data, int type, void *event) 371static void _file_closed_cb(void *data, int type, void *event)
372{ 372{
@@ -378,7 +378,7 @@ static void _file_closed_cb(void *data, int type, void *event)
378 } 378 }
379} 379}
380 380
381START_TEST(eio_test_monitor_directory_file_closed_notify) 381EFL_START_TEST(eio_test_monitor_directory_file_closed_notify)
382{ 382{
383 Eina_Tmpstr *dirname = _common_init(); 383 Eina_Tmpstr *dirname = _common_init();
384 Eina_Stringshare *filename; 384 Eina_Stringshare *filename;
@@ -398,7 +398,7 @@ START_TEST(eio_test_monitor_directory_file_closed_notify)
398 398
399 _common_shutdown(dirname); 399 _common_shutdown(dirname);
400} 400}
401END_TEST 401EFL_END_TEST
402 402
403static void _directory_created_cb(void *data, int type, void *event) 403static void _directory_created_cb(void *data, int type, void *event)
404{ 404{
@@ -410,7 +410,7 @@ static void _directory_created_cb(void *data, int type, void *event)
410 } 410 }
411} 411}
412 412
413START_TEST(eio_test_monitor_directory_directory_created_notify) 413EFL_START_TEST(eio_test_monitor_directory_directory_created_notify)
414{ 414{
415 Eina_Tmpstr *dirname = _common_init(); 415 Eina_Tmpstr *dirname = _common_init();
416 Eina_Stringshare *filename; 416 Eina_Stringshare *filename;
@@ -430,7 +430,7 @@ START_TEST(eio_test_monitor_directory_directory_created_notify)
430 430
431 _common_shutdown(dirname); 431 _common_shutdown(dirname);
432} 432}
433END_TEST 433EFL_END_TEST
434 434
435static void _directory_deleted_cb(void *data, int type, void *event) 435static void _directory_deleted_cb(void *data, int type, void *event)
436{ 436{
@@ -442,7 +442,7 @@ static void _directory_deleted_cb(void *data, int type, void *event)
442 } 442 }
443} 443}
444 444
445START_TEST(eio_test_monitor_directory_directory_deleted_notify) 445EFL_START_TEST(eio_test_monitor_directory_directory_deleted_notify)
446{ 446{
447 Eina_Tmpstr *dirname = _common_init(); 447 Eina_Tmpstr *dirname = _common_init();
448 Eina_Stringshare *filename; 448 Eina_Stringshare *filename;
@@ -463,7 +463,7 @@ START_TEST(eio_test_monitor_directory_directory_deleted_notify)
463 463
464 _common_shutdown(dirname); 464 _common_shutdown(dirname);
465} 465}
466END_TEST 466EFL_END_TEST
467 467
468static void _directory_modified_cb(void *data, int type, void *event) 468static void _directory_modified_cb(void *data, int type, void *event)
469{ 469{
@@ -476,7 +476,7 @@ static void _directory_modified_cb(void *data, int type, void *event)
476} 476}
477 477
478 478
479START_TEST(eio_test_monitor_directory_directory_modified_notify) 479EFL_START_TEST(eio_test_monitor_directory_directory_modified_notify)
480{ 480{
481 Eina_Tmpstr *dirname = _common_init(); 481 Eina_Tmpstr *dirname = _common_init();
482 Eina_Stringshare *filename; 482 Eina_Stringshare *filename;
@@ -497,7 +497,7 @@ START_TEST(eio_test_monitor_directory_directory_modified_notify)
497 497
498 _common_shutdown(dirname); 498 _common_shutdown(dirname);
499} 499}
500END_TEST 500EFL_END_TEST
501 501
502 502
503static void _directory_self_deleted_cb(void *data, int type, void *event) 503static void _directory_self_deleted_cb(void *data, int type, void *event)
@@ -511,7 +511,7 @@ static void _directory_self_deleted_cb(void *data, int type, void *event)
511} 511}
512 512
513 513
514START_TEST(eio_test_monitor_directory_directory_self_deleted_notify) 514EFL_START_TEST(eio_test_monitor_directory_directory_self_deleted_notify)
515{ 515{
516 Eina_Tmpstr *dirname = _common_init(); 516 Eina_Tmpstr *dirname = _common_init();
517 517
@@ -528,11 +528,11 @@ START_TEST(eio_test_monitor_directory_directory_self_deleted_notify)
528 528
529 _common_shutdown(dirname); 529 _common_shutdown(dirname);
530} 530}
531END_TEST 531EFL_END_TEST
532 532
533//////// test monitoring a single file 533//////// test monitoring a single file
534 534
535START_TEST(eio_test_monitor_file_file_modified_notify) 535EFL_START_TEST(eio_test_monitor_file_file_modified_notify)
536{ 536{
537 Eina_Tmpstr *dirname = _common_init(); 537 Eina_Tmpstr *dirname = _common_init();
538 Eina_Stringshare *filename; 538 Eina_Stringshare *filename;
@@ -554,9 +554,9 @@ START_TEST(eio_test_monitor_file_file_modified_notify)
554 //cleanup 554 //cleanup
555 _common_shutdown(dirname); 555 _common_shutdown(dirname);
556} 556}
557END_TEST 557EFL_END_TEST
558 558
559START_TEST(eio_test_monitor_file_file_attrib_modified_notify) 559EFL_START_TEST(eio_test_monitor_file_file_attrib_modified_notify)
560{ 560{
561 Eina_Tmpstr *dirname = _common_init(); 561 Eina_Tmpstr *dirname = _common_init();
562 Eina_Stringshare *filename; 562 Eina_Stringshare *filename;
@@ -577,10 +577,10 @@ START_TEST(eio_test_monitor_file_file_attrib_modified_notify)
577 577
578 _common_shutdown(dirname); 578 _common_shutdown(dirname);
579} 579}
580END_TEST 580EFL_END_TEST
581 581
582 582
583START_TEST(eio_test_monitor_file_file_closed_notify) 583EFL_START_TEST(eio_test_monitor_file_file_closed_notify)
584{ 584{
585 Eina_Tmpstr *dirname = _common_init(); 585 Eina_Tmpstr *dirname = _common_init();
586 Eina_Stringshare *filename; 586 Eina_Stringshare *filename;
@@ -600,9 +600,9 @@ START_TEST(eio_test_monitor_file_file_closed_notify)
600 600
601 _common_shutdown(dirname); 601 _common_shutdown(dirname);
602} 602}
603END_TEST 603EFL_END_TEST
604 604
605START_TEST(eio_test_monitor_file_file_self_deleted_notify) 605EFL_START_TEST(eio_test_monitor_file_file_self_deleted_notify)
606{ 606{
607 Eina_Tmpstr *dirname = _common_init(); 607 Eina_Tmpstr *dirname = _common_init();
608 Eina_Stringshare *filename; 608 Eina_Stringshare *filename;
@@ -623,9 +623,9 @@ START_TEST(eio_test_monitor_file_file_self_deleted_notify)
623 623
624 _common_shutdown(dirname); 624 _common_shutdown(dirname);
625} 625}
626END_TEST 626EFL_END_TEST
627 627
628START_TEST(eio_test_monitor_two_monitors_one_event) 628EFL_START_TEST(eio_test_monitor_two_monitors_one_event)
629{ 629{
630 Eina_Tmpstr *dirname = _common_init(); 630 Eina_Tmpstr *dirname = _common_init();
631 Eina_Tmpstr *dirname2; 631 Eina_Tmpstr *dirname2;
@@ -650,10 +650,10 @@ START_TEST(eio_test_monitor_two_monitors_one_event)
650 _delete_directory((void*)dirname2); 650 _delete_directory((void*)dirname2);
651 _common_shutdown(dirname); 651 _common_shutdown(dirname);
652} 652}
653END_TEST 653EFL_END_TEST
654 654
655 655
656START_TEST(eio_test_monitor_two_monitors_one_removed_one_event) 656EFL_START_TEST(eio_test_monitor_two_monitors_one_removed_one_event)
657{ 657{
658 Eina_Tmpstr *dirname = _common_init(); 658 Eina_Tmpstr *dirname = _common_init();
659 Eina_Tmpstr *dirname2; 659 Eina_Tmpstr *dirname2;
@@ -681,14 +681,14 @@ START_TEST(eio_test_monitor_two_monitors_one_removed_one_event)
681 _delete_directory((void*)dirname2); 681 _delete_directory((void*)dirname2);
682 _common_shutdown(dirname); 682 _common_shutdown(dirname);
683} 683}
684END_TEST 684EFL_END_TEST
685 685
686static void _unexpected_event_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) 686static void _unexpected_event_cb(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED)
687{ 687{
688 ck_abort_msg("unexpected event"); 688 ck_abort_msg("unexpected event");
689} 689}
690 690
691START_TEST(eio_test_monitor_two_monitors_one_removed_no_event) 691EFL_START_TEST(eio_test_monitor_two_monitors_one_removed_no_event)
692{ 692{
693 Eina_Tmpstr *dirname = _common_init(); 693 Eina_Tmpstr *dirname = _common_init();
694 Eina_Tmpstr *dirname2; 694 Eina_Tmpstr *dirname2;
@@ -717,9 +717,9 @@ START_TEST(eio_test_monitor_two_monitors_one_removed_no_event)
717 _delete_directory((void*)dirname2); 717 _delete_directory((void*)dirname2);
718 _common_shutdown(dirname); 718 _common_shutdown(dirname);
719} 719}
720END_TEST 720EFL_END_TEST
721 721
722START_TEST(eio_test_monitor_two_files_in_same_directory) 722EFL_START_TEST(eio_test_monitor_two_files_in_same_directory)
723{ 723{
724 Eina_Tmpstr *dirname = _common_init(); 724 Eina_Tmpstr *dirname = _common_init();
725 Eina_Stringshare *filename; 725 Eina_Stringshare *filename;
@@ -745,10 +745,10 @@ START_TEST(eio_test_monitor_two_files_in_same_directory)
745 //cleanup 745 //cleanup
746 _common_shutdown(dirname); 746 _common_shutdown(dirname);
747} 747}
748END_TEST 748EFL_END_TEST
749 749
750 750
751START_TEST(eio_test_monitor_two_files_in_same_directory_one_removed) 751EFL_START_TEST(eio_test_monitor_two_files_in_same_directory_one_removed)
752{ 752{
753 Eina_Tmpstr *dirname = _common_init(); 753 Eina_Tmpstr *dirname = _common_init();
754 Eina_Stringshare *filename; 754 Eina_Stringshare *filename;
@@ -778,7 +778,7 @@ START_TEST(eio_test_monitor_two_files_in_same_directory_one_removed)
778 //cleanup 778 //cleanup
779 _common_shutdown(dirname); 779 _common_shutdown(dirname);
780} 780}
781END_TEST 781EFL_END_TEST
782 782
783 783
784void eio_test_monitor(TCase *tc) 784void eio_test_monitor(TCase *tc)
diff --git a/src/tests/eio/eio_test_sentry.c b/src/tests/eio/eio_test_sentry.c
index c3e512973a..e95c78bfcb 100644
--- a/src/tests/eio/eio_test_sentry.c
+++ b/src/tests/eio/eio_test_sentry.c
@@ -133,7 +133,7 @@ static void _common_shutdown(Eina_Tmpstr *dirname)
133 133
134/////// tests monitoring a directory 134/////// tests monitoring a directory
135 135
136START_TEST(eio_test_sentry_add_and_remove) 136EFL_START_TEST(eio_test_sentry_add_and_remove)
137{ 137{
138 Eina_Tmpstr *dirname = _common_init(); 138 Eina_Tmpstr *dirname = _common_init();
139 Eina_Stringshare *filename; 139 Eina_Stringshare *filename;
@@ -157,9 +157,9 @@ START_TEST(eio_test_sentry_add_and_remove)
157 157
158 _common_shutdown(dirname); 158 _common_shutdown(dirname);
159} 159}
160END_TEST 160EFL_END_TEST
161 161
162START_TEST(eio_test_sentry_add_remove_add) 162EFL_START_TEST(eio_test_sentry_add_remove_add)
163{ 163{
164 Eina_Tmpstr *dirname = _common_init(); 164 Eina_Tmpstr *dirname = _common_init();
165 Eina_Stringshare *filename; 165 Eina_Stringshare *filename;
@@ -185,9 +185,9 @@ START_TEST(eio_test_sentry_add_remove_add)
185 185
186 _common_shutdown(dirname); 186 _common_shutdown(dirname);
187} 187}
188END_TEST 188EFL_END_TEST
189 189
190START_TEST(eio_test_sentry_add_add_remove_remove) 190EFL_START_TEST(eio_test_sentry_add_add_remove_remove)
191{ 191{
192 Eina_Tmpstr *dirname = _common_init(); 192 Eina_Tmpstr *dirname = _common_init();
193 Eina_Stringshare *filename1; 193 Eina_Stringshare *filename1;
@@ -215,7 +215,7 @@ START_TEST(eio_test_sentry_add_add_remove_remove)
215 215
216 _common_shutdown(dirname); 216 _common_shutdown(dirname);
217} 217}
218END_TEST 218EFL_END_TEST
219 219
220static void _target_notified_cb(void *data, const Efl_Event *event) 220static void _target_notified_cb(void *data, const Efl_Event *event)
221{ 221{
@@ -225,7 +225,7 @@ static void _target_notified_cb(void *data, const Efl_Event *event)
225} 225}
226 226
227 227
228START_TEST(eio_test_sentry_directory_file_created_notify) 228EFL_START_TEST(eio_test_sentry_directory_file_created_notify)
229{ 229{
230 Eina_Tmpstr *dirname = _common_init(); 230 Eina_Tmpstr *dirname = _common_init();
231 Eina_Stringshare *filename; 231 Eina_Stringshare *filename;
@@ -249,9 +249,9 @@ START_TEST(eio_test_sentry_directory_file_created_notify)
249 249
250 _common_shutdown(dirname); 250 _common_shutdown(dirname);
251} 251}
252END_TEST 252EFL_END_TEST
253 253
254START_TEST(eio_test_sentry_directory_file_deleted_notify) 254EFL_START_TEST(eio_test_sentry_directory_file_deleted_notify)
255{ 255{
256 Eina_Tmpstr *dirname = _common_init(); 256 Eina_Tmpstr *dirname = _common_init();
257 Eina_Stringshare *filename; 257 Eina_Stringshare *filename;
@@ -276,9 +276,9 @@ START_TEST(eio_test_sentry_directory_file_deleted_notify)
276 276
277 _common_shutdown(dirname); 277 _common_shutdown(dirname);
278} 278}
279END_TEST 279EFL_END_TEST
280 280
281START_TEST(eio_test_sentry_directory_file_modified_notify) 281EFL_START_TEST(eio_test_sentry_directory_file_modified_notify)
282{ 282{
283 Eina_Tmpstr *dirname = _common_init(); 283 Eina_Tmpstr *dirname = _common_init();
284 Eina_Stringshare *filename; 284 Eina_Stringshare *filename;
@@ -304,9 +304,9 @@ START_TEST(eio_test_sentry_directory_file_modified_notify)
304 //cleanup 304 //cleanup
305 _common_shutdown(dirname); 305 _common_shutdown(dirname);
306} 306}
307END_TEST 307EFL_END_TEST
308 308
309START_TEST(eio_test_sentry_directory_file_closed_notify) 309EFL_START_TEST(eio_test_sentry_directory_file_closed_notify)
310{ 310{
311 Eina_Tmpstr *dirname = _common_init(); 311 Eina_Tmpstr *dirname = _common_init();
312 Eina_Stringshare *filename; 312 Eina_Stringshare *filename;
@@ -330,9 +330,9 @@ START_TEST(eio_test_sentry_directory_file_closed_notify)
330 330
331 _common_shutdown(dirname); 331 _common_shutdown(dirname);
332} 332}
333END_TEST 333EFL_END_TEST
334 334
335START_TEST(eio_test_sentry_directory_directory_created_notify) 335EFL_START_TEST(eio_test_sentry_directory_directory_created_notify)
336{ 336{
337 Eina_Tmpstr *dirname = _common_init(); 337 Eina_Tmpstr *dirname = _common_init();
338 Eina_Stringshare *filename; 338 Eina_Stringshare *filename;
@@ -356,9 +356,9 @@ START_TEST(eio_test_sentry_directory_directory_created_notify)
356 356
357 _common_shutdown(dirname); 357 _common_shutdown(dirname);
358} 358}
359END_TEST 359EFL_END_TEST
360 360
361START_TEST(eio_test_sentry_directory_directory_deleted_notify) 361EFL_START_TEST(eio_test_sentry_directory_directory_deleted_notify)
362{ 362{
363 Eina_Tmpstr *dirname = _common_init(); 363 Eina_Tmpstr *dirname = _common_init();
364 Eina_Stringshare *filename; 364 Eina_Stringshare *filename;
@@ -383,9 +383,9 @@ START_TEST(eio_test_sentry_directory_directory_deleted_notify)
383 383
384 _common_shutdown(dirname); 384 _common_shutdown(dirname);
385} 385}
386END_TEST 386EFL_END_TEST
387 387
388START_TEST(eio_test_sentry_directory_directory_modified_notify) 388EFL_START_TEST(eio_test_sentry_directory_directory_modified_notify)
389{ 389{
390 Eina_Tmpstr *dirname = _common_init(); 390 Eina_Tmpstr *dirname = _common_init();
391 Eina_Stringshare *filename; 391 Eina_Stringshare *filename;
@@ -410,9 +410,9 @@ START_TEST(eio_test_sentry_directory_directory_modified_notify)
410 410
411 _common_shutdown(dirname); 411 _common_shutdown(dirname);
412} 412}
413END_TEST 413EFL_END_TEST
414 414
415START_TEST(eio_test_sentry_directory_directory_self_deleted_notify) 415EFL_START_TEST(eio_test_sentry_directory_directory_self_deleted_notify)
416{ 416{
417 Eina_Tmpstr *dirname = _common_init(); 417 Eina_Tmpstr *dirname = _common_init();
418 Eo *sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get()); 418 Eo *sentry = efl_add(EIO_SENTRY_CLASS, efl_main_loop_get());
@@ -432,11 +432,11 @@ START_TEST(eio_test_sentry_directory_directory_self_deleted_notify)
432 432
433 _common_shutdown(dirname); 433 _common_shutdown(dirname);
434} 434}
435END_TEST 435EFL_END_TEST
436 436
437// //////// test monitoring a single file 437// //////// test monitoring a single file
438 438
439START_TEST(eio_test_sentry_file_file_modified_notify) 439EFL_START_TEST(eio_test_sentry_file_file_modified_notify)
440{ 440{
441 Eina_Tmpstr *dirname = _common_init(); 441 Eina_Tmpstr *dirname = _common_init();
442 Eina_Stringshare *filename; 442 Eina_Stringshare *filename;
@@ -462,9 +462,9 @@ START_TEST(eio_test_sentry_file_file_modified_notify)
462 //cleanup 462 //cleanup
463 _common_shutdown(dirname); 463 _common_shutdown(dirname);
464} 464}
465END_TEST 465EFL_END_TEST
466 466
467START_TEST(eio_test_sentry_file_file_attrib_modified_notify) 467EFL_START_TEST(eio_test_sentry_file_file_attrib_modified_notify)
468{ 468{
469 Eina_Tmpstr *dirname = _common_init(); 469 Eina_Tmpstr *dirname = _common_init();
470 Eina_Stringshare *filename; 470 Eina_Stringshare *filename;
@@ -489,10 +489,10 @@ START_TEST(eio_test_sentry_file_file_attrib_modified_notify)
489 489
490 _common_shutdown(dirname); 490 _common_shutdown(dirname);
491} 491}
492END_TEST 492EFL_END_TEST
493 493
494 494
495START_TEST(eio_test_sentry_file_file_closed_notify) 495EFL_START_TEST(eio_test_sentry_file_file_closed_notify)
496{ 496{
497 Eina_Tmpstr *dirname = _common_init(); 497 Eina_Tmpstr *dirname = _common_init();
498 Eina_Stringshare *filename; 498 Eina_Stringshare *filename;
@@ -516,9 +516,9 @@ START_TEST(eio_test_sentry_file_file_closed_notify)
516 516
517 _common_shutdown(dirname); 517 _common_shutdown(dirname);
518} 518}
519END_TEST 519EFL_END_TEST
520 520
521START_TEST(eio_test_sentry_file_file_self_deleted_notify) 521EFL_START_TEST(eio_test_sentry_file_file_self_deleted_notify)
522{ 522{
523 Eina_Tmpstr *dirname = _common_init(); 523 Eina_Tmpstr *dirname = _common_init();
524 Eina_Stringshare *filename; 524 Eina_Stringshare *filename;
@@ -543,9 +543,9 @@ START_TEST(eio_test_sentry_file_file_self_deleted_notify)
543 543
544 _common_shutdown(dirname); 544 _common_shutdown(dirname);
545} 545}
546END_TEST 546EFL_END_TEST
547 547
548START_TEST(eio_test_sentry_two_monitors_one_event) 548EFL_START_TEST(eio_test_sentry_two_monitors_one_event)
549{ 549{
550 Eina_Tmpstr *dirname = _common_init(); 550 Eina_Tmpstr *dirname = _common_init();
551 Eina_Tmpstr *dirname2; 551 Eina_Tmpstr *dirname2;
@@ -574,10 +574,10 @@ START_TEST(eio_test_sentry_two_monitors_one_event)
574 _delete_directory((void*)dirname2); 574 _delete_directory((void*)dirname2);
575 _common_shutdown(dirname); 575 _common_shutdown(dirname);
576} 576}
577END_TEST 577EFL_END_TEST
578 578
579 579
580START_TEST(eio_test_sentry_two_monitors_one_removed_one_event) 580EFL_START_TEST(eio_test_sentry_two_monitors_one_removed_one_event)
581{ 581{
582 Eina_Tmpstr *dirname = _common_init(); 582 Eina_Tmpstr *dirname = _common_init();
583 Eina_Tmpstr *dirname2; 583 Eina_Tmpstr *dirname2;
@@ -607,14 +607,14 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_one_event)
607 _delete_directory((void*)dirname2); 607 _delete_directory((void*)dirname2);
608 _common_shutdown(dirname); 608 _common_shutdown(dirname);
609} 609}
610END_TEST 610EFL_END_TEST
611 611
612static void _unexpected_event_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED) 612static void _unexpected_event_cb(void *data EINA_UNUSED, const Efl_Event *event EINA_UNUSED)
613{ 613{
614 ck_abort_msg("unexpected event"); 614 ck_abort_msg("unexpected event");
615} 615}
616 616
617START_TEST(eio_test_sentry_two_monitors_one_removed_no_event) 617EFL_START_TEST(eio_test_sentry_two_monitors_one_removed_no_event)
618{ 618{
619 Eina_Tmpstr *dirname = _common_init(); 619 Eina_Tmpstr *dirname = _common_init();
620 Eina_Tmpstr *dirname2; 620 Eina_Tmpstr *dirname2;
@@ -645,9 +645,9 @@ START_TEST(eio_test_sentry_two_monitors_one_removed_no_event)
645 _delete_directory((void*)dirname2); 645 _delete_directory((void*)dirname2);
646 _common_shutdown(dirname); 646 _common_shutdown(dirname);
647} 647}
648END_TEST 648EFL_END_TEST
649 649
650START_TEST(eio_test_sentry_two_files_in_same_directory) 650EFL_START_TEST(eio_test_sentry_two_files_in_same_directory)
651{ 651{
652 Eina_Tmpstr *dirname = _common_init(); 652 Eina_Tmpstr *dirname = _common_init();
653 Eina_Stringshare *filename; 653 Eina_Stringshare *filename;
@@ -677,10 +677,10 @@ START_TEST(eio_test_sentry_two_files_in_same_directory)
677 //cleanup 677 //cleanup
678 _common_shutdown(dirname); 678 _common_shutdown(dirname);
679} 679}
680END_TEST 680EFL_END_TEST
681 681
682 682
683START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed) 683EFL_START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed)
684{ 684{
685 Eina_Tmpstr *dirname = _common_init(); 685 Eina_Tmpstr *dirname = _common_init();
686 Eina_Stringshare *filename; 686 Eina_Stringshare *filename;
@@ -713,7 +713,7 @@ START_TEST(eio_test_sentry_two_files_in_same_directory_one_removed)
713 //cleanup 713 //cleanup
714 _common_shutdown(dirname); 714 _common_shutdown(dirname);
715} 715}
716END_TEST 716EFL_END_TEST
717 717
718 718
719void eio_test_sentry(TCase *tc) 719void eio_test_sentry(TCase *tc)
diff --git a/src/tests/eio/eio_test_xattr.c b/src/tests/eio/eio_test_xattr.c
index a727d7db20..4eff0b742e 100644
--- a/src/tests/eio/eio_test_xattr.c
+++ b/src/tests/eio/eio_test_xattr.c
@@ -130,7 +130,7 @@ _error_cb(void *data EINA_UNUSED, Eio_File *handler EINA_UNUSED, int error)
130 ecore_main_loop_quit(); 130 ecore_main_loop_quit();
131} 131}
132 132
133START_TEST(eio_test_xattr_set) 133EFL_START_TEST(eio_test_xattr_set)
134{ 134{
135 char *filename = "eio-tmpfile"; 135 char *filename = "eio-tmpfile";
136 Eina_Tmpstr *test_file_path; 136 Eina_Tmpstr *test_file_path;
@@ -186,9 +186,9 @@ START_TEST(eio_test_xattr_set)
186 eina_shutdown(); 186 eina_shutdown();
187 ecore_shutdown(); 187 ecore_shutdown();
188} 188}
189END_TEST 189EFL_END_TEST
190 190
191START_TEST(eio_test_xattr_types_set) 191EFL_START_TEST(eio_test_xattr_types_set)
192{ 192{
193 char *filename = "eio-tmpfile"; 193 char *filename = "eio-tmpfile";
194 194
@@ -257,7 +257,7 @@ START_TEST(eio_test_xattr_types_set)
257 eina_shutdown(); 257 eina_shutdown();
258 ecore_shutdown(); 258 ecore_shutdown();
259} 259}
260END_TEST 260EFL_END_TEST
261#endif 261#endif
262 262
263void eio_test_xattr(TCase *tc) 263void eio_test_xattr(TCase *tc)