Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

diff --combined buildtools/Cmake/AddTests.cmake
index 86d24c6,a44b366..a622fd1
--- 1/buildtools/Cmake/AddTests.cmake
--- 2/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@@ -21,11 -21,12 +21,12 @@@ SET(DROP_SITE_CDASH TRUE
  SET(TRIGGER_SITE "http://cdash.inria.fr/CDash/cgi-bin/Submit-Random-TestingResults.cgi")
  #If you use the --read-var-info option Memcheck will run more slowly but may give a more detailed description of any illegal address.
  
- IF(WIN32)
- SET(TESH_COMMAND perl.exe ${CMAKE_BINARY_DIR}/bin/tesh)
- SET(TESH_OPTION $TESH_OPTION --timeout 50)
+ find_program(PERL_PROGRAM NAMES perl)
+ SET(TESH_COMMAND ${PERL_PROGRAM} ${CMAKE_BINARY_DIR}/bin/tesh)
+ IF(CMAKE_HOST_WIN32)
+   SET(TESH_OPTION $TESH_OPTION --timeout 50)
  ELSE()
- SET(TESH_COMMAND perl ${CMAKE_BINARY_DIR}/bin/tesh)
+   SET(TESH_COMMAND perl ${CMAKE_BINARY_DIR}/bin/tesh)
  ENDIF()
  
  #some tests may take forever on non futexes systems, using busy_wait with n cores < n workers
@@@ -234,7 -235,6 +235,7 @@@ IF(NOT enable_memcheck
    ADD_TESH_FACTORIES(msg-cloud-simple-vm         "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/cloud/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/ --cd ${CMAKE_BINARY_DIR}/examples/msg/cloud/ ${CMAKE_HOME_DIRECTORY}/examples/msg/cloud/simple_vm.tesh)
    ADD_TESH_FACTORIES(msg-energy-pstates          "thread;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/pstate/pstate.tesh)
    ADD_TESH_FACTORIES(msg-energy-consumption      "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e2/energy_consumption.tesh)
 +  ADD_TESH_FACTORIES(msg-energy-onoff "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/onoff/onoff.tesh)
    ADD_TESH_FACTORIES(msg-energy-concurrent-tasks "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy/e3/concurrent_tasks.tesh)
    ADD_TESH_FACTORIES(msg-token-ring              "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)
    ADD_TESH_FACTORIES(msg-migration               "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)