From: Martin Quinson <martin.quinson@loria.fr>
Date: Sat, 2 Dec 2017 19:18:42 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3.18~182
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/315c1504ff4aec5188611d052a65c97aec85cd92

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

315c1504ff4aec5188611d052a65c97aec85cd92
diff --cc examples/msg/CMakeLists.txt
index b04c7e8e2c,50ead3b8f7..b525bb8c22
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@@ -78,33 -78,26 +78,33 @@@ set(xml_files    ${xml_files}     ${CMA
  
  foreach(x app-chainsend app-masterworker app-pingpong app-token-ring
            cloud-capping cloud-masterworker cloud-migration cloud-simple 
-           cloud-two-tasks dht-pastry dht-kademlia platform-failures io-file io-remote io-storage task-priority
 -          cloud-two-tasks dht-pastry dht-kademlia platform-failures io-file io-remote task-priority 
++          cloud-two-tasks dht-pastry dht-kademlia platform-failures io-file io-remote task-priority
 +	  energy-consumption energy-onoff energy-pstate energy-vm
 +	  plugin-hostload
            process-create process-join process-startkilltime
            platform-properties synchro-semaphore)
 -  ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh)
 +  ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" 
 +                              --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x}
 +			      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/${x} 
 +			      --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms 
 +			      ${CMAKE_HOME_DIRECTORY}/examples/msg/${x}/${x}.tesh)
  endforeach()
  
 -foreach (example consumption onoff pstate vm)
 -  ADD_TESH_FACTORIES(msg-energy-${example} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-${example}/energy-${example}.tesh)
 +foreach (x trace-categories trace-route-user-variables trace-link-user-variables trace-masterworker trace-platform trace-process-migration trace-host-user-variables)
 +  ADD_TESH(msg-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x}
 +	            --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/${x} 
 +		    --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms 
 +		    ${CMAKE_HOME_DIRECTORY}/examples/msg/${x}/${x}.tesh)
  endforeach()
  
 -foreach (x categories route-user-variables link-user-variables masterworker platform process-migration host-user-variables)
 -  ADD_TESH(msg-trace-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/trace-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/trace-${x} trace-${x}.tesh)
 -endforeach()
 +ADD_TESH_FACTORIES(msg-dht-kademlia-parallel "thread;ucontext;raw;boost" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} 
 +                                             --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-kademlia 
 +					     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia
 +					     --setenv platfdir=${CMAKE_HOME_DIRECTORY}/examples/platforms
 +					     ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia/dht-kademlia.tesh)
  
 -ADD_TESH_FACTORIES(msg-dht-kademlia-parallel           "thread;ucontext;raw;boost" --cfg contexts/nthreads:4 ${CONTEXTS_SYNCHRO} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/dht-kademlia --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/dht-kademlia dht-kademlia.tesh)
 -ADD_TESH_FACTORIES(msg-energy-pstate-ptask             "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-pstate/energy-pstate.tesh)
 -ADD_TESH_FACTORIES(msg-energy-consumption-ptask        "thread;ucontext;raw;boost" --cfg host/model:ptask_L07 --log xbt_cfg.threshold:critical --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-consumption/energy-consumption.tesh)
 -ADD_TESH_FACTORIES(msg-plugin-hostload "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/ ${CMAKE_HOME_DIRECTORY}/examples/msg/plugin-hostload/plugin-hostload.tesh)
  if(NOT WIN32)
 -  ADD_TESH_FACTORIES(msg-maestro-set                     "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/maestro-set/maestro-set.tesh)
 +  ADD_TESH_FACTORIES(msg-maestro-set   "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/maestro-set/maestro-set.tesh)
  else()
    message("Test maestro-set disabled on windows: this feature is not working")
  endif()
diff --cc teshsuite/msg/io-raw-storage/io-raw-storage.tesh
index 46e6259180,1d7523fe68..52e2412e5b
--- a/teshsuite/msg/io-raw-storage/io-raw-storage.tesh
+++ b/teshsuite/msg/io-raw-storage/io-raw-storage.tesh
@@@ -1,6 -1,6 +1,6 @@@
  #! ./tesh
  
- $ ${bindir:=.}/io-storage$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 -$ ${bindir:=.}/io-raw-storage$EXEEXT ${platfdir:=.}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
++$ ./io-raw-storage$EXEEXT ${platfdir}/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
  > [  0.000000] (1:@denise) *** Storage info on denise ***
  > [  0.000000] (1:@denise) Storage name: Disk2, mount name: c:
  > [  0.000000] (1:@denise) Storage name: Disk4, mount name: /home