disable a broken test, and cleanups

We won't implement DPOR+mutex before 3.12, so remove its test. If a
user tries to use it, we have a big fat warning in position so it's OK.

diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt
index 375b3a1..8256397 100644 (file)
--- a/teshsuite/mc/CMakeLists.txt
+++ b/teshsuite/mc/CMakeLists.txt
@@ -2,17 +2,17 @@ if(HAVE_MC)
   set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 endif()
 
-add_executable(mutex_handling mutex_handling.c)
-target_link_libraries(mutex_handling simgrid)
+add_executable(with_mutex_handling mutex_handling.c)
+target_link_libraries(with_mutex_handling simgrid)
 
-add_executable(no_mutex_handling mutex_handling.c)
-target_link_libraries(no_mutex_handling simgrid)
-set_target_properties(no_mutex_handling PROPERTIES COMPILE_FLAGS -DDISABLE_THE_MUTEX=1)
+add_executable(without_mutex_handling mutex_handling.c)
+target_link_libraries(without_mutex_handling simgrid)
+set_target_properties(without_mutex_handling PROPERTIES COMPILE_FLAGS -DDISABLE_THE_MUTEX=1)
 
 set(tesh_files
   ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/mutex_handling.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/no_mutex_handling.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/with_mutex_handling.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/without_mutex_handling.tesh
   PARENT_SCOPE
   )
 set(testsuite_src

diff --git a/teshsuite/mc/mutex_handling.tesh b/teshsuite/mc/mutex_handling.tesh
deleted file mode 100644 (file)
index 43dc21c..0000000
--- a/teshsuite/mc/mutex_handling.tesh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env tesh
-! expect return 1
-! output ignore
-$ ${bindir:=.}/../../bin/simgrid-mc ${bindir:=.}/mutex_handling ../../examples/platforms/platform.xml mutex_handling.xml

diff --git a/teshsuite/mc/no_mutex_handling.tesh b/teshsuite/mc/no_mutex_handling.tesh
deleted file mode 100644 (file)
index 863b78b..0000000
--- a/teshsuite/mc/no_mutex_handling.tesh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env tesh
-! expect return 1
-! output ignore
-$ ${bindir:=.}/../../bin/simgrid-mc ${bindir:=.}/no_mutex_handling ../../examples/platforms/platform.xml mutex_handling.xml

diff --git a/teshsuite/mc/with_mutex_handling.tesh b/teshsuite/mc/with_mutex_handling.tesh
new file mode 100644 (file)
index 0000000..0df840c
--- /dev/null
+++ b/teshsuite/mc/with_mutex_handling.tesh
@@ -0,0 +1,4 @@
+#!/usr/bin/env tesh
+! expect return 1
+! output ignore
+$ ${bindir:=.}/../../bin/simgrid-mc ${bindir:=.}/with_mutex_handling ../../examples/platforms/platform.xml mutex_handling.xml

diff --git a/teshsuite/mc/without_mutex_handling.tesh b/teshsuite/mc/without_mutex_handling.tesh
new file mode 100644 (file)
index 0000000..f950a22
--- /dev/null
+++ b/teshsuite/mc/without_mutex_handling.tesh
@@ -0,0 +1,4 @@
+#!/usr/bin/env tesh
+! expect return 1
+! output ignore
+$ ${bindir:=.}/../../bin/simgrid-mc ${bindir:=.}/without_mutex_handling ../../examples/platforms/platform.xml mutex_handling.xml

diff --git a/tools/cmake/AddTests.cmake b/tools/cmake/AddTests.cmake
index ebdd393..769ba47 100644 (file)
--- a/tools/cmake/AddTests.cmake
+++ b/tools/cmake/AddTests.cmake
@@ -101,10 +101,10 @@ IF(NOT enable_memcheck)
     ADD_TESH(tesh-mc-dwarf                       --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/dwarf --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf dwarf.tesh)
     ADD_TESH(tesh-mc-dwarf-expression            --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/dwarf_expression --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/dwarf_expression dwarf_expression.tesh)
 
-    ADD_TESH(tesh-mc-mutex-handling              --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc mutex_handling.tesh --cfg=model-check/reduction:none)
-    ADD_TESH(tesh-mc-mutex-handling-dpor         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc mutex_handling.tesh --cfg=model-check/reduction:dpor)
-    ADD_TESH(tesh-mc-no-mutex-handling           --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc no_mutex_handling.tesh --cfg=model-check/reduction:none)
-    ADD_TESH(tesh-mc-no-mutex-handling-dpor      --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc no_mutex_handling.tesh --cfg=model-check/reduction:dpor)
+    ADD_TESH(tesh-mc-with-mutex-handling              --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc mutex_handling.tesh --cfg=model-check/reduction:none)
+#    ADD_TESH(tesh-mc-with-mutex-handling-dpor         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc mutex_handling.tesh --cfg=model-check/reduction:dpor)
+    ADD_TESH(tesh-mc-without-mutex-handling           --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc no_mutex_handling.tesh --cfg=model-check/reduction:none)
+    ADD_TESH(tesh-mc-without-mutex-handling-dpor      --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc no_mutex_handling.tesh --cfg=model-check/reduction:dpor)
 
     ADD_TESH(mc-record-random-bug                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/replay --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay random_bug.tesh)