From 5600b332a41cb88c0ff3326559f88930b11d1b47 Mon Sep 17 00:00:00 2001 From: Tom Hacohen Date: Tue, 22 May 2012 11:13:15 +0000 Subject: [PATCH] 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 --- legacy/eobj/cmake/Modules/EFLCheck.cmake | 2 -- legacy/eobj/tests/eo_suite.c | 4 ++++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/legacy/eobj/cmake/Modules/EFLCheck.cmake b/legacy/eobj/cmake/Modules/EFLCheck.cmake index 88a2adc97b..f72932533b 100644 --- a/legacy/eobj/cmake/Modules/EFLCheck.cmake +++ b/legacy/eobj/cmake/Modules/EFLCheck.cmake @@ -1,5 +1,3 @@ -SET(MEMORYCHECK_COMMAND_OPTIONS "--show-reachable=no") - include(CTest) ENABLE_TESTING() add_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 5291a7b5d5..69c3ad7446 100644 --- a/legacy/eobj/tests/eo_suite.c +++ b/legacy/eobj/tests/eo_suite.c @@ -75,6 +75,8 @@ main(int argc, char **argv) Suite *s; SRunner *sr; int i, failed_count; + eo_init(); + setenv("CK_FORK", "no", 0); for (i = 1; i < argc; i++) if ((strcmp(argv[i], "-h") == 0) || @@ -99,5 +101,7 @@ main(int argc, char **argv) failed_count = srunner_ntests_failed(sr); srunner_free(sr); + eo_shutdown(); + return (failed_count == 0) ? 0 : 255; }