Add 3 figures to the design goals + minor rewording

[simgrid.git] / tools / cmake / Tests.cmake

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 4ded9f1cd901f7637336e85484a6c6898c865e91..ba1e45f9de652e46b5e3e16c62ce009c0d9302dc 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -40,9 +40,6 @@ ENDIF()
 MACRO(ADD_TESH NAME)
   SET(ARGT ${ARGV})
   LIST(REMOVE_AT ARGT 0)
-  IF(WIN32)
-    STRING(REPLACE "§" "\;" ARGT "${ARGT}")
-  ENDIF()
   if(VALGRIND_WRAPPER)
     ADD_TEST(${NAME} ${TESH_COMMAND} --wrapper "${VALGRIND_WRAPPER}" ${TESH_OPTION} ${ARGT})
   else()
@@ -112,15 +109,6 @@ MACRO(SET_TESH_PROPERTIES NAME FACTORIES)
   ENDFOREACH()
 ENDMACRO()
 
-IF(enable_java)
-  IF(WIN32)
-    SET(TESH_CLASSPATH_SEPARATOR "§")
-  ELSE()
-    SET(TESH_CLASSPATH_SEPARATOR ":")
-  ENDIF()
-  SET(TESH_CLASSPATH "${CMAKE_BINARY_DIR}/examples/deprecated/java/${TESH_CLASSPATH_SEPARATOR}${CMAKE_BINARY_DIR}/teshsuite/java/${TESH_CLASSPATH_SEPARATOR}${SIMGRID_JAR}")
-ENDIF()
-
 # New tests should use the Catch Framework
 set(UNIT_TESTS  src/xbt/unit-tests_main.cpp
                 src/kernel/resource/NetworkModelFactors_test.cpp
@@ -139,10 +127,18 @@ set(UNIT_TESTS  src/xbt/unit-tests_main.cpp
                 src/xbt/random_test.cpp
                 src/xbt/xbt_str_test.cpp
                 src/kernel/lmm/maxmin_test.cpp)
+
+set(MC_UNIT_TESTS src/mc/sosp/Snapshot_test.cpp 
+                  src/mc/sosp/PageStore_test.cpp
+                  src/mc/explo/udpor/EventSet_test.cpp
+                  src/mc/explo/udpor/Unfolding_test.cpp
+                  src/mc/explo/udpor/UnfoldingEvent_test.cpp
+                  src/mc/explo/udpor/History_test.cpp
+                  src/mc/explo/udpor/Configuration_test.cpp)
 if (SIMGRID_HAVE_MC)
-  set(UNIT_TESTS ${UNIT_TESTS} src/mc/sosp/Snapshot_test.cpp src/mc/sosp/PageStore_test.cpp)
+  set(UNIT_TESTS ${UNIT_TESTS} ${MC_UNIT_TESTS})
 else()
-  set(EXTRA_DIST ${EXTRA_DIST} src/mc/sosp/Snapshot_test.cpp src/mc/sosp/PageStore_test.cpp)
+  set(EXTRA_DIST ${EXTRA_DIST} ${MC_UNIT_TESTS})
 endif()
 if (SIMGRID_HAVE_EIGEN3)
   set(UNIT_TESTS ${UNIT_TESTS} src/kernel/lmm/bmf_test.cpp)