moved tests to src folder, have several binaries now instead of a single monolithic test

CMakeLists.txt

@@ -79,7 +79,7 @@ if(STORM_COMPILE_WITH_CCACHE)
 endif()
 
 # Base path for test files
-set(STORM_CPP_TESTS_BASE_PATH "${PROJECT_SOURCE_DIR}/test")
+set(STORM_CPP_TESTS_BASE_PATH "${PROJECT_SOURCE_DIR}/src/test")
 
 set(STORMPY_OUTPUT_DIR "${PROJECT_BINARY_DIR}/stormpy")
 set(STORMPY_SOURCE_DIR "${PROJECT_SOURCE_DIR}/stormpy")
@@ -330,7 +330,9 @@ set(STORM_GENERATED_SOURCES "${PROJECT_BINARY_DIR}/src/storm/utility/storm-versi
 # Add the binary dir include directory for storm-config.h
 include_directories("${PROJECT_BINARY_DIR}/include")
 
+include(CTest)
+
+
 add_subdirectory(src)
-add_subdirectory(test)
 
 include(StormCPackConfig.cmake)

src/CMakeLists.txt

@@ -1,3 +1,12 @@
 add_subdirectory(storm)
 add_subdirectory(storm-pgcl)
 add_subdirectory(storm-pgcl-cli)
+
+
+add_subdirectory(test)
+
+
+
+file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/*.h ${PROJECT_SOURCE_DIR}/src/*.cpp)
+
+register_source_groups_from_filestructure("${ALL_FILES}")

src/storm/CMakeLists.txt

@@ -18,10 +18,6 @@ set(STORM_MAIN_SOURCES  ${STORM_MAIN_FILE})
 set(STORM_DFT_MAIN_SOURCES ${STORM_DFT_MAIN_FILE})
 set(STORM_GSPN_MAIN_SOURCES ${STORM_GSPN_MAIN_FILE})
 
-file(GLOB_RECURSE ALL_FILES ${PROJECT_SOURCE_DIR}/src/storm/*.h ${PROJECT_SOURCE_DIR}/src/storm/*.cpp)
-
-register_source_groups_from_filestructure("${ALL_FILES}")
-
 # Add custom additional include or link directories
 if (ADDITIONAL_INCLUDE_DIRS)
 	message(STATUS "StoRM - Using additional include directories ${ADDITIONAL_INCLUDE_DIRS}")

src/test/CMakeLists.txt

@@ -0,0 +1,28 @@
+# Test Sources
+# Note that the tests also need the source files, except for the main file
+include_directories(${GTEST_INCLUDE_DIR})
+
+
+configure_file (
+		"${PROJECT_SOURCE_DIR}/src/test/storm-test-config.h.in"
+		"${PROJECT_BINARY_DIR}/src/test/storm-config.h"
+)
+
+foreach (testsuite adapter builder logic modelchecker parser permissiveschedulers solver storage transformer utility)
+
+	  file(GLOB_RECURSE TEST_${testsuite}_FILES ${STORM_CPP_TESTS_BASE_PATH}/${testsuite}/*.h ${STORM_CPP_TESTS_BASE_PATH}/${testsuite}/*.cpp)
+      add_executable (test-${testsuite} ${TEST_${testsuite}_FILES})
+	  target_link_libraries(test-${testsuite} storm)
+	  target_link_libraries(test-${testsuite} ${STORM_TEST_LINK_LIBRARIES})
+
+	  add_dependencies(test-${testsuite} test-resources)
+	  add_test(run-test-${testsuite} test-${testsuite})
+endforeach ()
+
+
+
+#INSTALL(TARGETS storm-functional-tests
+#	RUNTIME DESTINATION bin
+#	LIBRARY DESTINATION lib
+#	ARCHIVE DESTINATION lib
+#)