summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2012-05-22 11:13:15 +0000
committerTom Hacohen <tom@stosb.com>2012-05-22 11:13:15 +0000
commit5600b332a41cb88c0ff3326559f88930b11d1b47 (patch)
treecabb562b9598fec91f1d35f00625601e953971f4 /legacy
parentf35bbc39235d1647cb0a50bb675c0420ab18ba5f (diff)
Eo: Fix the test suite to run with CK_FORK=no.
Make it possible to do it, and make it default. And remove the now useless valgrind option (we want to see still reachable now that libcheck works). SVN revision: 71316
Diffstat (limited to 'legacy')
-rw-r--r--legacy/eobj/cmake/Modules/EFLCheck.cmake2
-rw-r--r--legacy/eobj/tests/eo_suite.c4
2 files changed, 4 insertions, 2 deletions
diff --git a/legacy/eobj/cmake/Modules/EFLCheck.cmake b/legacy/eobj/cmake/Modules/EFLCheck.cmake
index 88a2adc..f729325 100644
--- a/legacy/eobj/cmake/Modules/EFLCheck.cmake
+++ b/legacy/eobj/cmake/Modules/EFLCheck.cmake
@@ -1,5 +1,3 @@
1SET(MEMORYCHECK_COMMAND_OPTIONS "--show-reachable=no")
2
3include(CTest) 1include(CTest)
4ENABLE_TESTING() 2ENABLE_TESTING()
5add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure) 3add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --output-on-failure)
diff --git a/legacy/eobj/tests/eo_suite.c b/legacy/eobj/tests/eo_suite.c
index 5291a7b..69c3ad7 100644
--- a/legacy/eobj/tests/eo_suite.c
+++ b/legacy/eobj/tests/eo_suite.c
@@ -75,6 +75,8 @@ main(int argc, char **argv)
75 Suite *s; 75 Suite *s;
76 SRunner *sr; 76 SRunner *sr;
77 int i, failed_count; 77 int i, failed_count;
78 eo_init();
79 setenv("CK_FORK", "no", 0);
78 80
79 for (i = 1; i < argc; i++) 81 for (i = 1; i < argc; i++)
80 if ((strcmp(argv[i], "-h") == 0) || 82 if ((strcmp(argv[i], "-h") == 0) ||
@@ -99,5 +101,7 @@ main(int argc, char **argv)
99 failed_count = srunner_ntests_failed(sr); 101 failed_count = srunner_ntests_failed(sr);
100 srunner_free(sr); 102 srunner_free(sr);
101 103
104 eo_shutdown();
105
102 return (failed_count == 0) ? 0 : 255; 106 return (failed_count == 0) ? 0 : 255;
103} 107}