Added some testing things:

- ctest command script (linux)
- Minor Bugfixes

TestScenarios/CMakeLists.txt

@@ -3,7 +3,12 @@ cmake_minimum_required(VERSION 2.8)
 enable_testing()
 
 if (CMAKE_COMPILER_IS_GNUCC)
-add_definitions( -Wall -O0 -g)
+#add_definitions( -Wall -O0 -g)
+SET(CMAKE_C_FLAGS "-g -O0 -Wall -W -fprofile-arcs -ftest-coverage")
+ 
+#SET(CMAKE_SHARED_LINKER_FLAGS="-fprofile-arcs -ftest-coverage")
+#SET(CMAKE_EXE_LINKER_FLAGS "-fprofile-arcs -ftest-coverage")
+
 endif (CMAKE_COMPILER_IS_GNUCC)
 
 if (COMPILE_SINGLETON)

TestScenarios/ctest-command.cmake

@@ -0,0 +1,34 @@
+SET (CTEST_PROJECT_NAME TestScenarios)
+SET (CTEST_CMAKE_GENERATOR "Unix Makefiles")
+
+SET (CTEST_SOURCE_DIRECTORY "/home/yorn/runtime-New_configuration/TestScenarios")
+SET (CTEST_BINARY_DIRECTORY "/tmp/build")
+
+# which ctest command to use for running the dashboard
+SET (CTEST_COMMAND 
+  "/usr/bin/ctest -D ExperimentalCoverage"
+  )
+
+# what cmake command to use for configuring this dashboard
+SET (CTEST_CMAKE_COMMAND 
+  "/usr/bin/cmake"
+  )
+
+set (CTEST_COVERAGE_COMMAND "/usr/bin/gcov")
+
+SET (CTEST_START_WITH_EMPTY_BINARY_DIRECTORY TRUE)
+
+CTEST_START (ExperimentalCoverage)
+#CTEST_UPDATE (SOURCE "${CTEST_SOURCE_DIRECTORY}")
+CTEST_CONFIGURE (BUILD "${CTEST_BINARY_DIRECTORY}")
+# turn on coverage for build and test
+#SET(RES 1)
+#EXECUTE_PROCESS(COMMAND ${COV01} -1 RESULT_VARIABLE RES)
+#IF(RES)
+# MESSAGE(FATAL_ERROR "could not run cov01 -1")
+#ENDIF(RES)
+CTEST_BUILD (BUILD "${CTEST_BINARY_DIRECTORY}")
+CTEST_TEST  (BUILD "${CTEST_BINARY_DIRECTORY}")
+CTEST_COVERAGE(BUILD "${CTEST_BINARY_DIRECTORY}")
+#CTEST_SUBMIT ()
+#EXECUTE_PROCESS(COMMAND ${COV01} -0 RESULT_VARIABLE RES)

TestScenarios/test-c/Test_ParallelRegions/CMakeLists.txt

@@ -1,11 +1,12 @@
-include_directories(../../src-gen-c/Test_ParallelRegions)
+SET( LOCALDIR ../../src-gen-c/Test_ParallelRegions)
+include_directories( ${LOCALDIR} )
 
 add_executable(TestParallelRegionsMain main.c)
 target_link_libraries(TestParallelRegionsMain Test_ParallelRegionsStatemachine)
 
 add_test(test_initialization TestParallelRegionsMain "1")
 add_test(test_state1_transition_event1 TestParallelRegionsMain "2")
-# add_test(test_state1_transition_and_back TestParallelRegionsMain "3")
+add_test(test_state1_transition_and_back TestParallelRegionsMain "3")
 add_test(test_state1_transition_and_back_from_state3 TestParallelRegionsMain "4")
 add_test(test_state1_transition_and_back_from_state7 TestParallelRegionsMain "5")
 add_test(test_state1_transition_to_State4 TestParallelRegionsMain "6")