From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 27 Aug 2015 17:46:48 +0000 (+0200)
Subject: Merge branch 'master' into S4U
X-Git-Tag: v3_13~1690^2
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2dacf5b5e81474fb89d8234b907f6f61b623983e?hp=-c

Merge branch 'master' into S4U
---

2dacf5b5e81474fb89d8234b907f6f61b623983e
diff --combined .gitignore
index 4b208aac55,6dff2de688..6e70b85c5a
--- a/.gitignore
+++ b/.gitignore
@@@ -17,6 -17,7 +17,7 @@@
  
  ### cmake
  CTestCustom.cmake
+ CTestResults.xml
  
  ### Maintainer mode
  src/simdag/dax_dtd.l
@@@ -181,7 -182,6 +182,7 @@@ examples/msg/masterslave/masterslave_co
  examples/msg/irc_isend/peer
  examples/msg/irc_isend/toto.txt
  examples/msg/ns3/ns3
 +examples/s4u/dumb/s4u_test
  examples/simdag/sd_avail
  examples/simdag/ex_sd_seq_access
  examples/simdag/sd_seq_access
diff --combined tools/cmake/AddTests.cmake
index 887e358225,ebdd393c13..6e15755de5
--- a/tools/cmake/AddTests.cmake
+++ b/tools/cmake/AddTests.cmake
@@@ -101,6 -101,11 +101,11 @@@ 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(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)
  
      ADD_TESH_FACTORIES(mc-bugged1                "ucontext;raw" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
@@@ -279,10 -284,6 +284,10 @@@
    ADD_TEST(msg-icomms-waitany                      ${CMAKE_BINARY_DIR}/examples/msg/icomms/peer3 ${CMAKE_HOME_DIRECTORY}/examples/platforms/small_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/icomms/deployment_peer05.xml)
    # END TESH TESTS
  
 +  ### S4U ###
 +  ADD_TESH_FACTORIES(s4u-dumb "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/dumb s4u_test.tesh)
 +  ADD_TESH_FACTORIES(s4u-io "thread;ucontext;raw;boost" --cd ${CMAKE_HOME_DIRECTORY}/examples/s4u/io s4u_io_test.tesh)
 +
  
    ### SIMDAG ###
    # BEGIN TESH TESTS