dimmus
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Eo tests: remove hack to prevent eo_init()/shutdown() cycles. 

We can now remove it thanks to the previous commit.
This commit is contained in:
Tom Hacohen 2016-02-03 16:38:29 +00:00
parent 668fd4a6e8
commit 54dcab5fda
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tests/eo/suite/eo_suite.c
View File

@ -80,8 +80,6 @@ main(int argc, char **argv)
Suite *s; Suite *s;
SRunner *sr; SRunner *sr;
int i, failed_count; int i, failed_count;
eo_init();
setenv("CK_FORK", "no", 0);
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
if ((strcmp(argv[i], "-h") == 0) || if ((strcmp(argv[i], "-h") == 0) ||
@ -110,7 +108,5 @@ main(int argc, char **argv)
failed_count = srunner_ntests_failed(sr); failed_count = srunner_ntests_failed(sr);
srunner_free(sr); srunner_free(sr);
eo_shutdown();
return (failed_count == 0) ? 0 : 255; return (failed_count == 0) ? 0 : 255;
} }

4
src/tests/eo/suite/eo_test_init.c
View File

@ -10,9 +10,9 @@
START_TEST(eo_simple) START_TEST(eo_simple)
{ {
fail_if(!eo_init()); /* one init by test suite */ fail_if(!eo_init()); /* one init by test suite */
fail_if(eo_init() != 1); fail_if(!eo_init());
fail_if(eo_shutdown() != 1);
fail_if(!eo_shutdown()); fail_if(!eo_shutdown());
fail_if(eo_shutdown());
} }
END_TEST END_TEST