reorg teshsuite/mc

diff --git a/.gitignore b/.gitignore
index 41f683d..6d2c7dd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -261,9 +261,9 @@ teshsuite/java/SemaphoreGC/SemaphoreGC_compiled
 teshsuite/java/SleepHostOff/SleepHostOff_compiled
 teshsuite/mc/dwarf/dwarf
 teshsuite/mc/dwarf-expression/dwarf-expression
-teshsuite/mc/replay/random_bug
-teshsuite/mc/with_mutex_handling
-teshsuite/mc/without_mutex_handling
+teshsuite/mc/random-bug/random-bug
+teshsuite/mc/mutex-handling/mutex-handling
+teshsuite/mc/without-mutex-handling
 teshsuite/msg/concurrent_rw/concurrent_rw
 teshsuite/msg/get_sender/get_sender
 teshsuite/msg/host_on_off/host_on_off

diff --git a/teshsuite/mc/CMakeLists.txt b/teshsuite/mc/CMakeLists.txt
index bd4e08b..40ad3a8 100644 (file)
--- a/teshsuite/mc/CMakeLists.txt
+++ b/teshsuite/mc/CMakeLists.txt
@@ -3,20 +3,40 @@ foreach(x dwarf dwarf-expression)
     add_executable       (${x}  ${x}/${x}.cpp)
     target_link_libraries(${x}  simgrid)
     set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
+
+    ADD_TESH(tesh-mc-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/${x} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/${x} ${x}.tesh)
   endif()
 
   set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
   set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.cpp)
 endforeach()
 
-add_executable       (with_mutex_handling    mutex_handling.c)
-target_link_libraries(with_mutex_handling    simgrid)
+add_executable       (without-mutex-handling 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_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mutex-handling)
+
+foreach(x mutex-handling random-bug)
+  add_executable       (${x} ${x}/${x}.c)
+  target_link_libraries(${x}  simgrid)
+  set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
+
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
+  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c)
+endforeach()
+
+set(teshsuite_src  ${teshsuite_src}                                                                        PARENT_SCOPE)
+set(tesh_files     ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/random-bug/random-bug-report.tesh
+                                    ${CMAKE_CURRENT_SOURCE_DIR}/mutex-handling/without-mutex-handling.tesh PARENT_SCOPE)
+set(xml_files      ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/mutex-handling/mutex-handling_d.xml        PARENT_SCOPE)
+
+IF(HAVE_MC)
+  ADD_TESH(tesh-mc-mutex-handling              --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling mutex-handling.tesh --cfg=model-check/reduction:none)
+# ADD_TESH(tesh-mc-mutex-handling-dpor         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling mutex-handling.tesh --cfg=model-check/reduction:dpor)
+  ADD_TESH(tesh-mc-without-mutex-handling      --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling without-mutex-handling.tesh --cfg=model-check/reduction:none)
+  ADD_TESH(tesh-mc-without-mutex-handling-dpor --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/mutex-handling --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/mutex-handling without-mutex-handling.tesh --cfg=model-check/reduction:dpor)
 
-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)
+  ADD_TESH(mc-random-bug-record                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/random-bug --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/random-bug random-bug-report.tesh)
+ENDIF()
 
-set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/with_mutex_handling.tesh
-                                     ${CMAKE_CURRENT_SOURCE_DIR}/without_mutex_handling.tesh    PARENT_SCOPE)
-set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/mutex_handling.c               PARENT_SCOPE)
-set(xml_files      ${xml_files}      ${CMAKE_CURRENT_SOURCE_DIR}/mutex_handling.xml             PARENT_SCOPE)
+ADD_TESH(mc-random-bug                         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/random-bug --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/random-bug random-bug.tesh)

diff --git a/teshsuite/mc/mutex_handling.c b/teshsuite/mc/mutex-handling/mutex-handling.c
similarity index 100%
rename from teshsuite/mc/mutex_handling.c
rename to teshsuite/mc/mutex-handling/mutex-handling.c

diff --git a/teshsuite/mc/with_mutex_handling.tesh b/teshsuite/mc/mutex-handling/mutex-handling.tesh
similarity index 100%
rename from teshsuite/mc/with_mutex_handling.tesh
rename to teshsuite/mc/mutex-handling/mutex-handling.tesh

diff --git a/teshsuite/mc/mutex_handling.xml b/teshsuite/mc/mutex-handling/mutex-handling_d.xml
similarity index 100%
rename from teshsuite/mc/mutex_handling.xml
rename to teshsuite/mc/mutex-handling/mutex-handling_d.xml

diff --git a/teshsuite/mc/without_mutex_handling.tesh b/teshsuite/mc/mutex-handling/without-mutex-handling.tesh
similarity index 100%
rename from teshsuite/mc/without_mutex_handling.tesh
rename to teshsuite/mc/mutex-handling/without-mutex-handling.tesh

diff --git a/teshsuite/mc/replay/random_bug.tesh b/teshsuite/mc/random-bug/random-bug-report.tesh
similarity index 92%
rename from teshsuite/mc/replay/random_bug.tesh
rename to teshsuite/mc/random-bug/random-bug-report.tesh
index b41a234..2ec5735 100644 (file)
--- a/teshsuite/mc/replay/random_bug.tesh
+++ b/teshsuite/mc/random-bug/random-bug-report.tesh
@@ -1,6 +1,6 @@
 #!/usr/bin/env tesh
 ! expect return 1
-$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random_bug ${srcdir:=.}/examples/platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=model-check/record:1
+$ ${bindir:=.}/../../../bin/simgrid-mc ${bindir:=.}/random-bug ${srcdir:=.}/examples/platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --log=xbt_cfg.thresh:warning --cfg=model-check/record:1
 > [  0.000000] (0:maestro@) Check a safety property
 > [  0.000000] (0:maestro@) **************************
 > [  0.000000] (0:maestro@) *** PROPERTY NOT VALID ***

diff --git a/teshsuite/mc/replay/random_bug.c b/teshsuite/mc/random-bug/random-bug.c
similarity index 100%
rename from teshsuite/mc/replay/random_bug.c
rename to teshsuite/mc/random-bug/random-bug.c

diff --git a/teshsuite/mc/replay/random_bug_replay.tesh b/teshsuite/mc/random-bug/random-bug.tesh
similarity index 75%
rename from teshsuite/mc/replay/random_bug_replay.tesh
rename to teshsuite/mc/random-bug/random-bug.tesh
index 240ebdb..c3f29d9 100644 (file)
--- a/teshsuite/mc/replay/random_bug_replay.tesh
+++ b/teshsuite/mc/random-bug/random-bug.tesh
@@ -1,4 +1,4 @@
 #!/usr/bin/env tesh
-$ ${bindir:=.}/random_bug  ${srcdir:=.}/examples/platforms/small_platform.xml  --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" "--cfg=model-check/replay:1/3;1/4"
+$ ${bindir:=.}/random-bug  ${srcdir:=.}/examples/platforms/small_platform.xml  --log=xbt_cfg.thresh:warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" "--cfg=model-check/replay:1/3;1/4"
 > [  0.000000] (0:maestro@) path=1/3;1/4
 > Error reached

diff --git a/teshsuite/mc/replay/CMakeLists.txt b/teshsuite/mc/replay/CMakeLists.txt
deleted file mode 100644 (file)
index 3b2d79a..0000000
--- a/teshsuite/mc/replay/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-add_executable       (random_bug random_bug.c)
-target_link_libraries(random_bug simgrid)
-
-set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/random_bug.tesh
-                                     ${CMAKE_CURRENT_SOURCE_DIR}/random_bug_replay.tesh  PARENT_SCOPE)
-set(testsuite_src  ${testsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/random_bug.c            PARENT_SCOPE)

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 8f46f9c..fe99eab 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -989,7 +989,6 @@ set(CMAKEFILES_TXT
 
   teshsuite/java/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
-    teshsuite/mc/replay/CMakeLists.txt
   teshsuite/msg/CMakeLists.txt
   teshsuite/simdag/CMakeLists.txt
     teshsuite/simdag/platforms/CMakeLists.txt

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index c0d1c06..a749ed4 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -51,20 +51,8 @@ IF(NOT enable_memcheck)
     ADD_TEST(test-tracing-help    ${CMAKE_BINARY_DIR}/teshsuite/simdag/basic-parsing-test/basic-parsing-test --help-tracing)
   # END TESH TESTS
 
-  ADD_TESH(mc-replay-random-bug                  --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc/replay --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay random_bug_replay.tesh)
-
   ### MC ###
   IF(HAVE_MC)
-    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-with-mutex-handling              --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/mc --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc with_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 with_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 without_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 without_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} --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/mc/replay random_bug.tesh)
-
     ADD_TESH_FACTORIES(mc-bugged1                "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
     ADD_TESH_FACTORIES(mc-bugged2                "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
     IF(HAVE_UCONTEXT_CONTEXTS AND PROCESSOR_x86_64) # liveness model-checking works only on 64bits (for now ...)