Browse Source

make tests builds all tests without running them. Make check now again works with the new location for executables

main
Sebastian Junges 10 years ago
parent
commit
1d8c5f26a4
  1. 6
      CMakeLists.txt
  2. 5
      src/test/CMakeLists.txt

6
CMakeLists.txt

@ -354,10 +354,14 @@ set(STORM_GENERATED_SOURCES "${PROJECT_BINARY_DIR}/src/storm/utility/storm-versi
include_directories("${PROJECT_BINARY_DIR}/include")
include(CTest)
# Compiles all tests
add_custom_target(tests)
# Compiles and runs all tests
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
set(CMAKE_CTEST_COMMAND_VERBOSE ${CMAKE_CTEST_COMMAND} -V)
add_custom_target(check-verbose COMMAND ${CMAKE_CTEST_COMMAND_VERBOSE})
add_dependencies(check tests)
add_dependencies(check-verbose tests)
set(STORM_TARGETS "")
add_subdirectory(src)

5
src/test/CMakeLists.txt

@ -17,9 +17,8 @@ foreach (testsuite adapter builder logic modelchecker parser permissivescheduler
target_link_libraries(test-${testsuite} ${STORM_TEST_LINK_LIBRARIES})
add_dependencies(test-${testsuite} test-resources)
add_test(run-test-${testsuite} test-${testsuite})
add_dependencies(check test-${testsuite})
add_dependencies(check-verbose test-${testsuite})
add_test(NAME run-test-${testsuite} COMMAND $<TARGET_FILE:test-${testsuite}>)
add_dependencies(tests test-${testsuite})
endforeach ()

Loading…
Cancel
Save