From: Christian Heinrich <franz-christian.heinrich@inria.fr>
Date: Fri, 12 Jan 2018 13:46:02 +0000 (+0100)
Subject: [SMPI] Fix smpi-replay-multiple test
X-Git-Tag: v3.19~312^2~44
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/4ad681b949af9540957937bbd661c01491248532

[SMPI] Fix smpi-replay-multiple test

I moved the SMPI_init() to the right location and
changed the tesh.
---

diff --git a/examples/smpi/replay_multiple/replay_multiple.c b/examples/smpi/replay_multiple/replay_multiple.c
index ebb03f3d7f..7c75a0bf80 100644
--- a/examples/smpi/replay_multiple/replay_multiple.c
+++ b/examples/smpi/replay_multiple/replay_multiple.c
@@ -21,6 +21,7 @@ int main(int argc, char *argv[]){
   msg_error_t res;
 
   MSG_init(&argc, argv);
+  SMPI_init();
 
   xbt_assert(argc > 3, "Usage: %s description_file platform_file deployment_file\n"
              "\tExample: %s smpi_multiple_apps msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
@@ -54,7 +55,6 @@ int main(int argc, char *argv[]){
   fclose(fp);
 
   MSG_launch_application(argv[3]);
-  SMPI_init();
 
   res = MSG_main();
 
diff --git a/examples/smpi/replay_multiple/replay_multiple.tesh b/examples/smpi/replay_multiple/replay_multiple.tesh
index d4ba9d26ed..b838228cd9 100644
--- a/examples/smpi/replay_multiple/replay_multiple.tesh
+++ b/examples/smpi/replay_multiple/replay_multiple.tesh
@@ -7,8 +7,8 @@ p This test needs maxmin/concurrency-limit=100 because it starts 64 hosts on 5 m
 ! timeout 120
 $ ./replay_multiple description_file ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${bindir:=.}/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] [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:<flops>" to set its value.Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information.
 > [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:<flops>" to set its value.Check http://simgrid.org/simgrid/latest/doc/options.html#options_smpi_bench for more information.
 > [Jupiter:2:(62) 1140698.106357] [smpi_replay/INFO] Simulation time 1124380.753685
 > [1140698.106357] [msg_test/INFO] Simulation time 1.1407e+06