summaryrefslogtreecommitdiff
path: root/src/tests/evil
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/evil
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/evil')
-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
7 files changed, 87 insertions, 87 deletions
diff --git a/src/tests/evil/evil_suite.h b/src/tests/evil/evil_suite.h
index b7ae5e8274..e7efc926ab 100644
--- a/src/tests/evil/evil_suite.h
+++ b/src/tests/evil/evil_suite.h
@@ -20,7 +20,7 @@
20#define EVIL_SUITE_H_ 20#define EVIL_SUITE_H_
21 21
22#include <check.h> 22#include <check.h>
23 23#include "../efl_check.h"
24void evil_test_dlfcn(TCase *tc); 24void evil_test_dlfcn(TCase *tc);
25/* void evil_test_fcntl(TCase *tc); */ 25/* void evil_test_fcntl(TCase *tc); */
26/* void evil_test_fnmatch(TCase *tc); */ 26/* void evil_test_fnmatch(TCase *tc); */
diff --git a/src/tests/evil/evil_test_dlfcn.c b/src/tests/evil/evil_test_dlfcn.c
index 0d0980e45d..e20ece8634 100644
--- a/src/tests/evil/evil_test_dlfcn.c
+++ b/src/tests/evil/evil_test_dlfcn.c
@@ -29,7 +29,7 @@ typedef int (*_evil_init)(void);
29typedef int (*_evil_shutdwon)(void); 29typedef int (*_evil_shutdwon)(void);
30 30
31 31
32START_TEST(evil_dlfcn_dlopen_success) 32EFL_START_TEST(evil_dlfcn_dlopen_success)
33{ 33{
34 void *mod; 34 void *mod;
35 int res; 35 int res;
@@ -40,9 +40,9 @@ START_TEST(evil_dlfcn_dlopen_success)
40 res = dlclose(mod); 40 res = dlclose(mod);
41 fail_if(res != 0); 41 fail_if(res != 0);
42} 42}
43END_TEST 43EFL_END_TEST
44 44
45START_TEST(evil_dlfcn_dlopen_failure) 45EFL_START_TEST(evil_dlfcn_dlopen_failure)
46{ 46{
47 void *mod; 47 void *mod;
48 48
@@ -50,9 +50,9 @@ START_TEST(evil_dlfcn_dlopen_failure)
50 mod = dlopen("c:\\windows\\system32\\kernel32.dl", 0); 50 mod = dlopen("c:\\windows\\system32\\kernel32.dl", 0);
51 fail_if(mod != NULL); 51 fail_if(mod != NULL);
52} 52}
53END_TEST 53EFL_END_TEST
54 54
55START_TEST(evil_dlfcn_dlsym_success) 55EFL_START_TEST(evil_dlfcn_dlsym_success)
56{ 56{
57 _evil_init sym_init; 57 _evil_init sym_init;
58 _evil_shutdwon sym_shutdown; 58 _evil_shutdwon sym_shutdown;
@@ -73,9 +73,9 @@ START_TEST(evil_dlfcn_dlsym_success)
73 res = dlclose(mod); 73 res = dlclose(mod);
74 fail_if(res != 0); 74 fail_if(res != 0);
75} 75}
76END_TEST 76EFL_END_TEST
77 77
78START_TEST(evil_dlfcn_dlsym_failure) 78EFL_START_TEST(evil_dlfcn_dlsym_failure)
79{ 79{
80 void *mod; 80 void *mod;
81 void *sym; 81 void *sym;
@@ -91,9 +91,9 @@ START_TEST(evil_dlfcn_dlsym_failure)
91 res = dlclose(mod); 91 res = dlclose(mod);
92 fail_if(res != 0); 92 fail_if(res != 0);
93} 93}
94END_TEST 94EFL_END_TEST
95 95
96START_TEST(evil_dlfcn_dladdr) 96EFL_START_TEST(evil_dlfcn_dladdr)
97{ 97{
98 Dl_info info; 98 Dl_info info;
99 void *mod; 99 void *mod;
@@ -119,7 +119,7 @@ START_TEST(evil_dlfcn_dladdr)
119 res = dlclose(mod); 119 res = dlclose(mod);
120 fail_if(res != 0); 120 fail_if(res != 0);
121} 121}
122END_TEST 122EFL_END_TEST
123 123
124void evil_test_dlfcn(TCase *tc) 124void evil_test_dlfcn(TCase *tc)
125{ 125{
diff --git a/src/tests/evil/evil_test_libgen.c b/src/tests/evil/evil_test_libgen.c
index eb8c17f18b..263e6de836 100644
--- a/src/tests/evil/evil_test_libgen.c
+++ b/src/tests/evil/evil_test_libgen.c
@@ -26,7 +26,7 @@
26 26
27#include "evil_suite.h" 27#include "evil_suite.h"
28 28
29START_TEST(evil_libgen_null) 29EFL_START_TEST(evil_libgen_null)
30{ 30{
31 char *dname; 31 char *dname;
32 char *bname; 32 char *bname;
@@ -36,9 +36,9 @@ START_TEST(evil_libgen_null)
36 bname = basename(NULL); 36 bname = basename(NULL);
37 fail_if(strcmp(bname, ".") != 0); 37 fail_if(strcmp(bname, ".") != 0);
38} 38}
39END_TEST 39EFL_END_TEST
40 40
41START_TEST(evil_libgen_empty) 41EFL_START_TEST(evil_libgen_empty)
42{ 42{
43 const char *path = ""; 43 const char *path = "";
44 char *dirc; 44 char *dirc;
@@ -59,9 +59,9 @@ START_TEST(evil_libgen_empty)
59 free(dirc); 59 free(dirc);
60 free(basec); 60 free(basec);
61} 61}
62END_TEST 62EFL_END_TEST
63 63
64START_TEST(evil_libgen_path) 64EFL_START_TEST(evil_libgen_path)
65{ 65{
66 const char *path = "/usr/lib"; 66 const char *path = "/usr/lib";
67 char *dirc; 67 char *dirc;
@@ -82,9 +82,9 @@ START_TEST(evil_libgen_path)
82 free(dirc); 82 free(dirc);
83 free(basec); 83 free(basec);
84} 84}
85END_TEST 85EFL_END_TEST
86 86
87START_TEST(evil_libgen_path_with_slash) 87EFL_START_TEST(evil_libgen_path_with_slash)
88{ 88{
89 const char *path = "/usr/"; 89 const char *path = "/usr/";
90 char *dirc; 90 char *dirc;
@@ -105,9 +105,9 @@ START_TEST(evil_libgen_path_with_slash)
105 free(dirc); 105 free(dirc);
106 free(basec); 106 free(basec);
107} 107}
108END_TEST 108EFL_END_TEST
109 109
110START_TEST(evil_libgen_folder) 110EFL_START_TEST(evil_libgen_folder)
111{ 111{
112 const char *path = "usr"; 112 const char *path = "usr";
113 char *dirc; 113 char *dirc;
@@ -128,9 +128,9 @@ START_TEST(evil_libgen_folder)
128 free(dirc); 128 free(dirc);
129 free(basec); 129 free(basec);
130} 130}
131END_TEST 131EFL_END_TEST
132 132
133START_TEST(evil_libgen_slash) 133EFL_START_TEST(evil_libgen_slash)
134{ 134{
135 const char *path = "/"; 135 const char *path = "/";
136 char *dirc; 136 char *dirc;
@@ -151,9 +151,9 @@ START_TEST(evil_libgen_slash)
151 free(dirc); 151 free(dirc);
152 free(basec); 152 free(basec);
153} 153}
154END_TEST 154EFL_END_TEST
155 155
156START_TEST(evil_libgen_dot) 156EFL_START_TEST(evil_libgen_dot)
157{ 157{
158 const char *path = "."; 158 const char *path = ".";
159 char *dirc; 159 char *dirc;
@@ -174,9 +174,9 @@ START_TEST(evil_libgen_dot)
174 free(dirc); 174 free(dirc);
175 free(basec); 175 free(basec);
176} 176}
177END_TEST 177EFL_END_TEST
178 178
179START_TEST(evil_libgen_dot_dot) 179EFL_START_TEST(evil_libgen_dot_dot)
180{ 180{
181 const char *path = ".."; 181 const char *path = "..";
182 char *dirc; 182 char *dirc;
@@ -197,9 +197,9 @@ START_TEST(evil_libgen_dot_dot)
197 free(dirc); 197 free(dirc);
198 free(basec); 198 free(basec);
199} 199}
200END_TEST 200EFL_END_TEST
201 201
202START_TEST(evil_libgen_win_dir_1) 202EFL_START_TEST(evil_libgen_win_dir_1)
203{ 203{
204 const char *path = "c:/foo/bar"; 204 const char *path = "c:/foo/bar";
205 char *dirc; 205 char *dirc;
@@ -220,9 +220,9 @@ fail_if(strcmp(bname, "bar") != 0);
220 free(dirc); 220 free(dirc);
221 free(basec); 221 free(basec);
222} 222}
223END_TEST 223EFL_END_TEST
224 224
225START_TEST(evil_libgen_win_dir_2) 225EFL_START_TEST(evil_libgen_win_dir_2)
226{ 226{
227 const char *path = "c:/foo\\bar"; 227 const char *path = "c:/foo\\bar";
228 char *dirc; 228 char *dirc;
@@ -243,9 +243,9 @@ START_TEST(evil_libgen_win_dir_2)
243 free(dirc); 243 free(dirc);
244 free(basec); 244 free(basec);
245} 245}
246END_TEST 246EFL_END_TEST
247 247
248START_TEST(evil_libgen_win_dir_3) 248EFL_START_TEST(evil_libgen_win_dir_3)
249{ 249{
250 const char *path = "c:\\foo/bar"; 250 const char *path = "c:\\foo/bar";
251 char *dirc; 251 char *dirc;
@@ -266,9 +266,9 @@ START_TEST(evil_libgen_win_dir_3)
266 free(dirc); 266 free(dirc);
267 free(basec); 267 free(basec);
268} 268}
269END_TEST 269EFL_END_TEST
270 270
271START_TEST(evil_libgen_win_dir_4) 271EFL_START_TEST(evil_libgen_win_dir_4)
272{ 272{
273 const char *path = "c:\\foo\\bar"; 273 const char *path = "c:\\foo\\bar";
274 char *dirc; 274 char *dirc;
@@ -289,7 +289,7 @@ START_TEST(evil_libgen_win_dir_4)
289 free(dirc); 289 free(dirc);
290 free(basec); 290 free(basec);
291} 291}
292END_TEST 292EFL_END_TEST
293 293
294void evil_test_libgen(TCase *tc) 294void evil_test_libgen(TCase *tc)
295{ 295{
diff --git a/src/tests/evil/evil_test_main.c b/src/tests/evil/evil_test_main.c
index d116aef166..ccca6ff2eb 100644
--- a/src/tests/evil/evil_test_main.c
+++ b/src/tests/evil/evil_test_main.c
@@ -24,12 +24,12 @@
24 24
25#include "evil_suite.h" 25#include "evil_suite.h"
26 26
27START_TEST(evil_main_simple) 27EFL_START_TEST(evil_main_simple)
28{ 28{
29 fail_if(evil_init() != 1); 29 fail_if(evil_init() != 1);
30 fail_if(evil_shutdown() != 0); 30 fail_if(evil_shutdown() != 0);
31} 31}
32END_TEST 32EFL_END_TEST
33 33
34void evil_test_main(TCase *tc) 34void evil_test_main(TCase *tc)
35{ 35{
diff --git a/src/tests/evil/evil_test_stdio.c b/src/tests/evil/evil_test_stdio.c
index eeab2d08e5..6b39059e9c 100644
--- a/src/tests/evil/evil_test_stdio.c
+++ b/src/tests/evil/evil_test_stdio.c
@@ -66,7 +66,7 @@ _evil_test_stdio_file_new_and_opened(const char *n, const char *t)
66 return f; 66 return f;
67} 67}
68 68
69START_TEST(evil_stdio_rename_src_file_none) 69EFL_START_TEST(evil_stdio_rename_src_file_none)
70{ 70{
71 int res; 71 int res;
72 72
@@ -76,9 +76,9 @@ START_TEST(evil_stdio_rename_src_file_none)
76 res = rename("evil_foo.txt", NULL); 76 res = rename("evil_foo.txt", NULL);
77 fail_if(res != -1); 77 fail_if(res != -1);
78} 78}
79END_TEST 79EFL_END_TEST
80 80
81START_TEST(evil_stdio_rename_dst_file_none) 81EFL_START_TEST(evil_stdio_rename_dst_file_none)
82{ 82{
83 int res1; 83 int res1;
84 int res2; 84 int res2;
@@ -98,9 +98,9 @@ START_TEST(evil_stdio_rename_dst_file_none)
98 fail_if(res3 == -1); 98 fail_if(res3 == -1);
99 fail_if(res4 == 0); 99 fail_if(res4 == 0);
100} 100}
101END_TEST 101EFL_END_TEST
102 102
103START_TEST(evil_stdio_rename_dst_file_exists) 103EFL_START_TEST(evil_stdio_rename_dst_file_exists)
104{ 104{
105 int res1; 105 int res1;
106 int res2; 106 int res2;
@@ -123,9 +123,9 @@ START_TEST(evil_stdio_rename_dst_file_exists)
123 fail_if(res2 == -1); 123 fail_if(res2 == -1);
124 fail_if(res3 == 0); 124 fail_if(res3 == 0);
125} 125}
126END_TEST 126EFL_END_TEST
127 127
128START_TEST(evil_stdio_rename_dst_file_used) 128EFL_START_TEST(evil_stdio_rename_dst_file_used)
129{ 129{
130 FILE *f; 130 FILE *f;
131 int res1; 131 int res1;
@@ -153,9 +153,9 @@ START_TEST(evil_stdio_rename_dst_file_used)
153 fail_if(res2 == -1); 153 fail_if(res2 == -1);
154 fail_if(res3 == -1); 154 fail_if(res3 == -1);
155} 155}
156END_TEST 156EFL_END_TEST
157 157
158START_TEST(evil_stdio_rename_dst_file_move_to_dir) 158EFL_START_TEST(evil_stdio_rename_dst_file_move_to_dir)
159{ 159{
160 int res1; 160 int res1;
161 int res2; 161 int res2;
@@ -178,9 +178,9 @@ START_TEST(evil_stdio_rename_dst_file_move_to_dir)
178 fail_if(res3 == -1); 178 fail_if(res3 == -1);
179 fail_if(res4 == 0); 179 fail_if(res4 == 0);
180} 180}
181END_TEST 181EFL_END_TEST
182 182
183START_TEST(evil_stdio_rename_dst_dir_none) 183EFL_START_TEST(evil_stdio_rename_dst_dir_none)
184{ 184{
185 int res1; 185 int res1;
186 int res2; 186 int res2;
@@ -197,9 +197,9 @@ START_TEST(evil_stdio_rename_dst_dir_none)
197 fail_if(res2 == -1); 197 fail_if(res2 == -1);
198 fail_if(res3 == 0); 198 fail_if(res3 == 0);
199} 199}
200END_TEST 200EFL_END_TEST
201 201
202START_TEST(evil_stdio_rename_dst_dir_exists) 202EFL_START_TEST(evil_stdio_rename_dst_dir_exists)
203{ 203{
204 int res1; 204 int res1;
205 int res2; 205 int res2;
@@ -222,7 +222,7 @@ START_TEST(evil_stdio_rename_dst_dir_exists)
222 fail_if(res2 == -1); 222 fail_if(res2 == -1);
223 fail_if(res3 == 0); 223 fail_if(res3 == 0);
224} 224}
225END_TEST 225EFL_END_TEST
226 226
227void evil_test_stdio(TCase *tc) 227void evil_test_stdio(TCase *tc)
228{ 228{
diff --git a/src/tests/evil/evil_test_stdlib.c b/src/tests/evil/evil_test_stdlib.c
index 9de3a149ff..a39515ccb4 100644
--- a/src/tests/evil/evil_test_stdlib.c
+++ b/src/tests/evil/evil_test_stdlib.c
@@ -26,7 +26,7 @@
26 26
27#include "evil_suite.h" 27#include "evil_suite.h"
28 28
29START_TEST(evil_stdlib_setenv_NULL) 29EFL_START_TEST(evil_stdlib_setenv_NULL)
30{ 30{
31 char *val; 31 char *val;
32 int res; 32 int res;
@@ -37,9 +37,9 @@ START_TEST(evil_stdlib_setenv_NULL)
37 val = getenv("EVIL_TEST_ENV"); 37 val = getenv("EVIL_TEST_ENV");
38 fail_if(val != 0); 38 fail_if(val != 0);
39} 39}
40END_TEST 40EFL_END_TEST
41 41
42START_TEST(evil_stdlib_setenv_NULL_after_set) 42EFL_START_TEST(evil_stdlib_setenv_NULL_after_set)
43{ 43{
44 char *val; 44 char *val;
45 int res; 45 int res;
@@ -58,9 +58,9 @@ START_TEST(evil_stdlib_setenv_NULL_after_set)
58 val = getenv("EVIL_TEST_ENV"); 58 val = getenv("EVIL_TEST_ENV");
59 fail_if(val != 0); 59 fail_if(val != 0);
60} 60}
61END_TEST 61EFL_END_TEST
62 62
63START_TEST(evil_stdlib_getenv_one) 63EFL_START_TEST(evil_stdlib_getenv_one)
64{ 64{
65 char *val; 65 char *val;
66 int res; 66 int res;
@@ -79,9 +79,9 @@ START_TEST(evil_stdlib_getenv_one)
79 val = getenv("EVIL_TEST_ENV"); 79 val = getenv("EVIL_TEST_ENV");
80 fail_if(val != 0); 80 fail_if(val != 0);
81} 81}
82END_TEST 82EFL_END_TEST
83 83
84START_TEST(evil_stdlib_getenv_two) 84EFL_START_TEST(evil_stdlib_getenv_two)
85{ 85{
86 char *val; 86 char *val;
87 int res; 87 int res;
@@ -114,9 +114,9 @@ START_TEST(evil_stdlib_getenv_two)
114 val = getenv("EVIL_TEST_ENV2"); 114 val = getenv("EVIL_TEST_ENV2");
115 fail_if(val != 0); 115 fail_if(val != 0);
116} 116}
117END_TEST 117EFL_END_TEST
118 118
119START_TEST(evil_stdlib_getenv_two_swapped) 119EFL_START_TEST(evil_stdlib_getenv_two_swapped)
120{ 120{
121 char *val; 121 char *val;
122 int res; 122 int res;
@@ -149,9 +149,9 @@ START_TEST(evil_stdlib_getenv_two_swapped)
149 val = getenv("EVIL_TEST_ENV2"); 149 val = getenv("EVIL_TEST_ENV2");
150 fail_if(val != 0); 150 fail_if(val != 0);
151} 151}
152END_TEST 152EFL_END_TEST
153 153
154START_TEST(evil_stdlib_unsetenv) 154EFL_START_TEST(evil_stdlib_unsetenv)
155{ 155{
156 char *val; 156 char *val;
157 int res; 157 int res;
@@ -167,9 +167,9 @@ START_TEST(evil_stdlib_unsetenv)
167 val = getenv("EVIL_TEST_ENV"); 167 val = getenv("EVIL_TEST_ENV");
168 fail_if(val != 0); 168 fail_if(val != 0);
169} 169}
170END_TEST 170EFL_END_TEST
171 171
172START_TEST(evil_stdlib_mkdtemp) 172EFL_START_TEST(evil_stdlib_mkdtemp)
173{ 173{
174 char template[] = "file_XXXXXX"; 174 char template[] = "file_XXXXXX";
175 char *res; 175 char *res;
@@ -179,9 +179,9 @@ START_TEST(evil_stdlib_mkdtemp)
179 179
180 fail_if(rmdir(res) < 0); 180 fail_if(rmdir(res) < 0);
181} 181}
182END_TEST 182EFL_END_TEST
183 183
184START_TEST(evil_stdlib_mkdtemp_fail) 184EFL_START_TEST(evil_stdlib_mkdtemp_fail)
185{ 185{
186 char template[] = "file_XXX"; 186 char template[] = "file_XXX";
187 char *res; 187 char *res;
@@ -189,9 +189,9 @@ START_TEST(evil_stdlib_mkdtemp_fail)
189 res = mkdtemp(template); 189 res = mkdtemp(template);
190 fail_if(res != NULL); 190 fail_if(res != NULL);
191} 191}
192END_TEST 192EFL_END_TEST
193 193
194START_TEST(evil_stdlib_mkstemp) 194EFL_START_TEST(evil_stdlib_mkstemp)
195{ 195{
196 char template[] = "file_XXXXXX"; 196 char template[] = "file_XXXXXX";
197 int fd; 197 int fd;
@@ -203,9 +203,9 @@ START_TEST(evil_stdlib_mkstemp)
203 203
204 fail_if(unlink(template) == -1); 204 fail_if(unlink(template) == -1);
205} 205}
206END_TEST 206EFL_END_TEST
207 207
208START_TEST(evil_stdlib_mkstemp_fail) 208EFL_START_TEST(evil_stdlib_mkstemp_fail)
209{ 209{
210 char template[] = "file_XXX"; 210 char template[] = "file_XXX";
211 int fd; 211 int fd;
@@ -213,9 +213,9 @@ START_TEST(evil_stdlib_mkstemp_fail)
213 fd = mkstemp(template); 213 fd = mkstemp(template);
214 fail_if(fd >= 0); 214 fail_if(fd >= 0);
215} 215}
216END_TEST 216EFL_END_TEST
217 217
218START_TEST(evil_stdlib_mkstemps) 218EFL_START_TEST(evil_stdlib_mkstemps)
219{ 219{
220 char template[] = "file_XXXXXX.ext"; 220 char template[] = "file_XXXXXX.ext";
221 int fd; 221 int fd;
@@ -227,9 +227,9 @@ START_TEST(evil_stdlib_mkstemps)
227 227
228 fail_if(unlink(template) == -1); 228 fail_if(unlink(template) == -1);
229} 229}
230END_TEST 230EFL_END_TEST
231 231
232START_TEST(evil_stdlib_mkstemps_fail_1) 232EFL_START_TEST(evil_stdlib_mkstemps_fail_1)
233{ 233{
234 char template[] = "file_XXX.ext"; 234 char template[] = "file_XXX.ext";
235 int fd; 235 int fd;
@@ -237,9 +237,9 @@ START_TEST(evil_stdlib_mkstemps_fail_1)
237 fd = mkstemps(template, 4); 237 fd = mkstemps(template, 4);
238 fail_if(fd >= 0); 238 fail_if(fd >= 0);
239} 239}
240END_TEST 240EFL_END_TEST
241 241
242START_TEST(evil_stdlib_mkstemps_fail_2) 242EFL_START_TEST(evil_stdlib_mkstemps_fail_2)
243{ 243{
244 char template[] = "file_XXX"; 244 char template[] = "file_XXX";
245 int fd; 245 int fd;
@@ -247,9 +247,9 @@ START_TEST(evil_stdlib_mkstemps_fail_2)
247 fd = mkstemps(template, 4); 247 fd = mkstemps(template, 4);
248 fail_if(fd >= 0); 248 fail_if(fd >= 0);
249} 249}
250END_TEST 250EFL_END_TEST
251 251
252START_TEST(evil_stdlib_realpath_1) 252EFL_START_TEST(evil_stdlib_realpath_1)
253{ 253{
254 char buf[PATH_MAX]; 254 char buf[PATH_MAX];
255 char *filename = "C:\\Windows\\System32\\kernel32.dll"; 255 char *filename = "C:\\Windows\\System32\\kernel32.dll";
@@ -258,9 +258,9 @@ START_TEST(evil_stdlib_realpath_1)
258 res = realpath(filename, buf); 258 res = realpath(filename, buf);
259 fail_if(res == NULL); 259 fail_if(res == NULL);
260} 260}
261END_TEST 261EFL_END_TEST
262 262
263START_TEST(evil_stdlib_realpath_2) 263EFL_START_TEST(evil_stdlib_realpath_2)
264{ 264{
265 char buf[PATH_MAX]; 265 char buf[PATH_MAX];
266 char *filename = "C:\\Windows\\System32\\.\\kernel32.dll"; 266 char *filename = "C:\\Windows\\System32\\.\\kernel32.dll";
@@ -269,9 +269,9 @@ START_TEST(evil_stdlib_realpath_2)
269 res = realpath(filename, buf); 269 res = realpath(filename, buf);
270 fail_if(res == NULL); 270 fail_if(res == NULL);
271} 271}
272END_TEST 272EFL_END_TEST
273 273
274START_TEST(evil_stdlib_realpath_3) 274EFL_START_TEST(evil_stdlib_realpath_3)
275{ 275{
276 char buf[PATH_MAX]; 276 char buf[PATH_MAX];
277 char *filename = "C:\\Windows\\System32\\..\\System32\\kernel32.dll"; 277 char *filename = "C:\\Windows\\System32\\..\\System32\\kernel32.dll";
@@ -280,9 +280,9 @@ START_TEST(evil_stdlib_realpath_3)
280 res = realpath(filename, buf); 280 res = realpath(filename, buf);
281 fail_if(res == NULL); 281 fail_if(res == NULL);
282} 282}
283END_TEST 283EFL_END_TEST
284 284
285START_TEST(evil_stdlib_realpath_fail) 285EFL_START_TEST(evil_stdlib_realpath_fail)
286{ 286{
287 char buf[PATH_MAX]; 287 char buf[PATH_MAX];
288 char *filename = "C:\\Windows\\System32\\System32\\kernel.dll"; 288 char *filename = "C:\\Windows\\System32\\System32\\kernel.dll";
@@ -291,7 +291,7 @@ START_TEST(evil_stdlib_realpath_fail)
291 res = realpath(filename, buf); 291 res = realpath(filename, buf);
292 fail_if(res != NULL); 292 fail_if(res != NULL);
293} 293}
294END_TEST 294EFL_END_TEST
295 295
296void evil_test_stdlib(TCase *tc) 296void evil_test_stdlib(TCase *tc)
297{ 297{
diff --git a/src/tests/evil/evil_test_unistd.c b/src/tests/evil/evil_test_unistd.c
index 0ab5f78146..8379400ed0 100644
--- a/src/tests/evil/evil_test_unistd.c
+++ b/src/tests/evil/evil_test_unistd.c
@@ -56,7 +56,7 @@ thread(void *param)
56 return 0; 56 return 0;
57} 57}
58 58
59START_TEST(evil_unistd_pipe) 59EFL_START_TEST(evil_unistd_pipe)
60{ 60{
61 int sockets[2]; 61 int sockets[2];
62 struct timeval t; 62 struct timeval t;
@@ -112,7 +112,7 @@ START_TEST(evil_unistd_pipe)
112 112
113 evil_shutdown(); 113 evil_shutdown();
114} 114}
115END_TEST 115EFL_END_TEST
116 116
117void evil_test_unistd(TCase *tc) 117void evil_test_unistd(TCase *tc)
118{ 118{