aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2013-12-23 16:07:46 +0100
committerAndreas Schneider <asn@cryptomilk.org>2013-12-23 16:09:42 +0100
commit8687e1b807393a152f32f6573c19cb97f509cb5c (patch)
tree9ba775a980b5ea4090321cc1c6eefebdd4473735
parentc154b2166173446df59b864ca997ba5ad6fd6c8e (diff)
downloadcmocka-8687e1b807393a152f32f6573c19cb97f509cb5c.tar.gz
cmocka-8687e1b807393a152f32f6573c19cb97f509cb5c.tar.xz
cmocka-8687e1b807393a152f32f6573c19cb97f509cb5c.zip
tests: Add test_fixtures.
-rw-r--r--example/CMakeLists.txt6
-rw-r--r--tests/CMakeLists.txt1
-rw-r--r--tests/test_fixtures.c (renamed from example/fixture_test.c)0
3 files changed, 1 insertions, 6 deletions
diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
index 7152a1e..0e7b0de 100644
--- a/example/CMakeLists.txt
+++ b/example/CMakeLists.txt
@@ -19,12 +19,6 @@ target_link_libraries(simple_test ${CMOCKA_SHARED_LIBRARY})
add_test(simple_test ${CMAKE_CURRENT_BINARY_DIR}/simple_test)
-### Test different fixture setups
-add_executable(fixture_test fixture_test.c)
-target_link_libraries(fixture_test ${CMOCKA_SHARED_LIBRARY})
-
-add_test(fixture_test ${CMAKE_CURRENT_BINARY_DIR}/fixture_test)
-
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 d2976f3..b9c6db4 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -7,6 +7,7 @@ include_directories(
)
set(CMOCKA_TESTS
+ test_fixtures
test_assert_macros
test_assert_macros_fail
test_exception_handler)
diff --git a/example/fixture_test.c b/tests/test_fixtures.c
index 757394a..757394a 100644
--- a/example/fixture_test.c
+++ b/tests/test_fixtures.c