diff options
-rw-r--r-- | example/CMakeLists.txt | 12 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 11 | ||||
-rw-r--r-- | tests/test_exception_handler.c (renamed from example/segfault_test.c) | 0 |
3 files changed, 10 insertions, 13 deletions
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index d649237..7152a1e 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -25,18 +25,6 @@ target_link_libraries(fixture_test ${CMOCKA_SHARED_LIBRARY}) add_test(fixture_test ${CMAKE_CURRENT_BINARY_DIR}/fixture_test) -### Test the exception handler with a segfault -add_executable(segfault_test segfault_test.c) -target_link_libraries(segfault_test ${CMOCKA_SHARED_LIBRARY}) - -add_test(segfault_test ${CMAKE_CURRENT_BINARY_DIR}/segfault_test) -set_tests_properties( - segfault_test - PROPERTIES - PASS_REGULAR_EXPRESSION - "Test failed with exception: (Segmentation fault|Segmentation Fault|11)" -) - add_executable(calculator_test calculator.c calculator_test.c) target_link_libraries(calculator_test ${CMOCKA_SHARED_LIBRARY}) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 0e258b4..d2976f3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -8,7 +8,8 @@ include_directories( set(CMOCKA_TESTS test_assert_macros - test_assert_macros_fail) + test_assert_macros_fail + test_exception_handler) foreach(_CMOCKA_TEST ${CMOCKA_TESTS}) add_cmocka_test(${_CMOCKA_TEST} ${_CMOCKA_TEST}.c ${CMOCKA_SHARED_LIBRARY}) @@ -23,3 +24,11 @@ set_tests_properties( PASS_REGULAR_EXPRESSION "\\[ FAILED \\] 1 test" ) + +# test_exception_handler +set_tests_properties( + test_exception_handler + PROPERTIES + PASS_REGULAR_EXPRESSION + "Test failed with exception: (Segmentation fault|Segmentation Fault|11)" +) diff --git a/example/segfault_test.c b/tests/test_exception_handler.c index 5727d1e..5727d1e 100644 --- a/example/segfault_test.c +++ b/tests/test_exception_handler.c |