From a96bfe1ee8deb9d1e994e78c4be07b0e3cdb7149 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Mon, 6 Feb 2017 08:37:42 +0100 Subject: [PATCH 1/1] This test requires concurrency_limit to 100 (but works with MC) --- examples/smpi/replay_multiple/CMakeLists.txt | 4 +--- examples/smpi/replay_multiple/replay_multiple.tesh | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/examples/smpi/replay_multiple/CMakeLists.txt b/examples/smpi/replay_multiple/CMakeLists.txt index eeb51608e6..cf33945936 100644 --- a/examples/smpi/replay_multiple/CMakeLists.txt +++ b/examples/smpi/replay_multiple/CMakeLists.txt @@ -3,9 +3,7 @@ if(enable_smpi) add_executable (replay_multiple replay_multiple.c) target_link_libraries(replay_multiple simgrid) - IF(NOT HAVE_MC) - ADD_TESH(smpi-replay-multiple --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple --cd ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple/replay_multiple.tesh) - ENDIF() + ADD_TESH(smpi-replay-multiple --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple --cd ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple/replay_multiple.tesh) endif() set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/generate_multiple_deployment.sh diff --git a/examples/smpi/replay_multiple/replay_multiple.tesh b/examples/smpi/replay_multiple/replay_multiple.tesh index 3764346960..d9877454b2 100644 --- a/examples/smpi/replay_multiple/replay_multiple.tesh +++ b/examples/smpi/replay_multiple/replay_multiple.tesh @@ -4,15 +4,12 @@ p first generate the deployment file $ ${srcdir:=.}/generate_multiple_deployment.sh -platform ${srcdir:=.}/../../platforms/small_platform_with_routers.xml -hostfile ${srcdir:=.}/../hostfile ${srcdir:=.}/description_file ${srcdir:=.}/deployment.xml ! timeout 120 -$ ./replay_multiple description_file ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/deployment.xml --log=smpi.:info +$ ./replay_multiple description_file ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/deployment.xml --log=smpi.:info --cfg=maxmin/concurrency_limit:100 +> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/concurrency_limit' to '100' > [0.000000] [msg_test/INFO] Initializing instance 1 of size 32 > [0.000000] [msg_test/INFO] Initializing instance 2 of size 32 > [0.000000] [smpi_kernel/INFO] You did not set the power of the host running the simulation. The timings will certainly not be accurate. Use the option "--cfg=smpi/host-speed:" to set its value.Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information. > [Jupiter:2:(52) 1140688.493796] [smpi_replay/INFO] Simulation time 1124371.141124 > [1140688.493796] [msg_test/INFO] Simulation time 1.14069e+06 - - - - $ rm -f deployment.xml -- 2.20.1