From: Frederic Suter <frederic.suter@cc.in2p3.fr>
Date: Sun, 15 Jul 2018 21:17:39 +0000 (+0200)
Subject: merge more tests in less tesh files
X-Git-Tag: v3_21~429
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/2a6c53b3bad0878d7205b29d23f54cbe4732e903?ds=sidebyside

merge more tests in less tesh files
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e69bb6b7f7..958ba4f90e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -763,15 +763,10 @@ configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_depl
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_compute_consecutive ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_compute_consecutive COPYONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_compute_consecutive2 ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_compute_consecutive2 COPYONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_compute_simple ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_compute_simple COPYONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_resources ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_resources COPYONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time COPYONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time_and_resources ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time_and_resources COPYONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_mixed1 ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_mixed1 COPYONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2 ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2 COPYONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_resources ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_resources COPYONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time COPYONLY)
 configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time_and_resources ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_mixed2_same_time_and_resources COPYONLY)
-configure_file(${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple_manual_deploy/workload_nojob ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple_manual_deploy/workload_nojob COPYONLY)
 
   set(generated_files_to_clean
     ${generated_files_to_clean}
diff --git a/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt b/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
index e1a0e5f566..5d5ad8cd8c 100644
--- a/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
+++ b/examples/smpi/replay_multiple_manual_deploy/CMakeLists.txt
@@ -6,17 +6,9 @@ if(enable_smpi)
 
   # Define a list of a tesh files
   list(APPEND tesh_filename_list replay_multiple_manual_nojob)
-  list(APPEND tesh_filename_list replay_multiple_manual_nojob_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_empty1)
   list(APPEND tesh_filename_list replay_multiple_manual_empty2)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_sr)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_sr_noise)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_st)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_st_noise)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_st_sr)
-  list(APPEND tesh_filename_list replay_multiple_manual_empty2_st_sr_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed1)
-  list(APPEND tesh_filename_list replay_multiple_manual_mixed1_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2_noise)
   list(APPEND tesh_filename_list replay_multiple_manual_mixed2_sr)
@@ -51,27 +43,14 @@ set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/compute_only.txt
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_compute_consecutive
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_compute_consecutive2
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_compute_simple
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2_same_resources
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2_same_time
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_empty2_same_time_and_resources
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed1
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_resources
                                    ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_time
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_time_and_resources
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_nojob PARENT_SCOPE)
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/workload_mixed2_same_time_and_resources PARENT_SCOPE)
 set(tesh_files  ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_nojob.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_nojob_noise.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty1.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_sr.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_sr_noise.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_st.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_st_noise.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_st_sr.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_empty2_st_sr_noise.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed1.tesh
-                                ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed1_noise.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_noise.tesh
                                 ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple_manual_mixed2_sr.tesh
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh
index 1c4f65cccf..3f0a500237 100644
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2.tesh
@@ -61,3 +61,193 @@ $ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:
 > [1013.000000] (maestro@) Simulation finished! Final time: 1013
 
 $ rm -f ${srcdir:=.}/workload_empty2 
+
+p Workload with two empty jobs (not at the same time, but on the same resources)
+
+< Two jobs not at the same time but using the same resources
+< job0 empty.txt 2 0 0,1
+< job1 empty.txt 2 1000 0,1
+$ mkfile ${srcdir:=.}/workload_empty2_same_resources
+
+! timeout 120
+! output sort 19
+$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
+> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='0,1'
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
+> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
+> [   0.000000] (workload_executor@Bourassa) Sleeping 1000 seconds (waiting for job 1000, app 'job1')
+> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
+> [   0.000000] (0_1@Fafard) Simulation time 0.000000
+> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
+> [1000.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
+> [1000.000000] (job_job1@Bourassa) Executing job 1 (smpi_app 'job1')
+> [1000.000000] (1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
+> [1000.000000] (1_1@Fafard) Replaying rank 1 of job 1 (smpi_app 'job1')
+> [1000.000000] (1_0@Bourassa) Simulation time 0.000000
+> [1000.000000] (1_1@Fafard) Simulation time 0.000000
+> [1000.000000] (1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
+> [1000.000000] (1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
+> [1000.000000] (job_job1@Bourassa) Finished job 1 (smpi_app 'job1')
+> [1000.000000] (maestro@) Simulation finished! Final time: 1000
+
+p Workload with two empty jobs (not at the same time, but on the same resources, with noise)
+! timeout 120
+! output sort 19
+$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
+> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='0,1'
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
+> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
+> [   0.000000] (workload_executor@Bourassa) Sleeping 1000 seconds (waiting for job 1000, app 'job1')
+> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
+> [   0.000000] (0_1@Fafard) Simulation time 0.000000
+> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
+> [1000.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
+> [1000.000000] (job_job1@Bourassa) Executing job 1 (smpi_app 'job1')
+> [1000.000000] (1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
+> [1000.000000] (1_1@Fafard) Replaying rank 1 of job 1 (smpi_app 'job1')
+> [1000.000000] (1_0@Bourassa) Simulation time 0.000000
+> [1000.000000] (1_1@Fafard) Simulation time 0.000000
+> [1000.000000] (1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
+> [1000.000000] (1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
+> [1000.000000] (job_job1@Bourassa) Finished job 1 (smpi_app 'job1')
+> [1013.000000] (maestro@) Simulation finished! Final time: 1013
+
+$ rm -f ${srcdir:=.}/workload_empty2_same_resources
+
+p Workload with two empty jobs (at the same time but not on the same resources)
+
+< Two jobs not at the same time but on different resources
+< job0 empty.txt 2 0 0,1
+< job1 empty.txt 2 0 2,3
+$ mkfile ${srcdir:=.}/workload_empty2_same_time
+
+! timeout 120
+! output sort 19
+$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
+> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='2,3'
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
+> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
+> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (job_job1@Ginette) Executing job 1 (smpi_app 'job1')
+> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (1_0@Ginette) Replaying rank 0 of job 1 (smpi_app 'job1')
+> [   0.000000] (1_1@Jupiter) Replaying rank 1 of job 1 (smpi_app 'job1')
+> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
+> [   0.000000] (0_1@Fafard) Simulation time 0.000000
+> [   0.000000] (1_0@Ginette) Simulation time 0.000000
+> [   0.000000] (1_1@Jupiter) Simulation time 0.000000
+> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
+> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1')
+> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   0.000000] (job_job1@Ginette) Finished job 1 (smpi_app 'job1')
+> [   0.000000] (maestro@) Simulation finished! Final time: 0
+
+p Workload with two empty jobs (at the same time but not on the same resources, with noise)
+! timeout 120
+! output sort 19
+$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
+> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='2,3'
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
+> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
+> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (job_job1@Ginette) Executing job 1 (smpi_app 'job1')
+> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (1_0@Ginette) Replaying rank 0 of job 1 (smpi_app 'job1')
+> [   0.000000] (1_1@Jupiter) Replaying rank 1 of job 1 (smpi_app 'job1')
+> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
+> [   0.000000] (0_1@Fafard) Simulation time 0.000000
+> [   0.000000] (1_0@Ginette) Simulation time 0.000000
+> [   0.000000] (1_1@Jupiter) Simulation time 0.000000
+> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
+> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1')
+> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   0.000000] (job_job1@Ginette) Finished job 1 (smpi_app 'job1')
+> [  13.000000] (maestro@) Simulation finished! Final time: 13
+
+$ rm -f ${srcdir:=.}/workload_empty2_same_time
+
+
+p Workload with two empty jobs (at the same time and on the same resources)
+
+< Two jobs at the same time and on same resources
+< job0 empty.txt 2 0 0,1
+< job1 empty.txt 2 0 0,1
+$ mkfile ${srcdir:=.}/workload_empty2_same_time_and_resources
+
+! timeout 120
+! output sort 19
+$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
+> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='0,1'
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
+> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
+> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (job_job1@Bourassa) Executing job 1 (smpi_app 'job1')
+> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
+> [   0.000000] (1_1@Fafard) Replaying rank 1 of job 1 (smpi_app 'job1')
+> [   0.000000] (1_0@Bourassa) Simulation time 0.000000
+> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
+> [   0.000000] (1_1@Fafard) Simulation time 0.000000
+> [   0.000000] (0_1@Fafard) Simulation time 0.000000
+> [   0.000000] (1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
+> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
+> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (job_job1@Bourassa) Finished job 1 (smpi_app 'job1')
+> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
+> [   0.000000] (maestro@) Simulation finished! Final time: 0
+
+p Workload with two empty jobs (at the same time and on the same resources, with noise)
+
+! timeout 120
+! output sort 19
+$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
+> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='0,1'
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
+> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
+> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (job_job1@Bourassa) Executing job 1 (smpi_app 'job1')
+> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
+> [   0.000000] (1_1@Fafard) Replaying rank 1 of job 1 (smpi_app 'job1')
+> [   0.000000] (1_0@Bourassa) Simulation time 0.000000
+> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
+> [   0.000000] (1_1@Fafard) Simulation time 0.000000
+> [   0.000000] (0_1@Fafard) Simulation time 0.000000
+> [   0.000000] (1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
+> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
+> [   0.000000] (1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
+> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
+> [   0.000000] (job_job1@Bourassa) Finished job 1 (smpi_app 'job1')
+> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
+> [  13.000000] (maestro@) Simulation finished! Final time: 13
+
+$ rm -f ${srcdir:=.}/workload_empty2_same_time_and_resources
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_sr.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_sr.tesh
deleted file mode 100644
index f21ce9c3ee..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_sr.tesh
+++ /dev/null
@@ -1,27 +0,0 @@
-p Workload with two empty jobs (not at the same time, but on the same resources)
-! timeout 120
-! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
-> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
-> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
-> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='0,1'
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
-> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
-> [   0.000000] (workload_executor@Bourassa) Sleeping 1000 seconds (waiting for job 1000, app 'job1')
-> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
-> [   0.000000] (0_1@Fafard) Simulation time 0.000000
-> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
-> [1000.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
-> [1000.000000] (job_job1@Bourassa) Executing job 1 (smpi_app 'job1')
-> [1000.000000] (1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
-> [1000.000000] (1_1@Fafard) Replaying rank 1 of job 1 (smpi_app 'job1')
-> [1000.000000] (1_0@Bourassa) Simulation time 0.000000
-> [1000.000000] (1_1@Fafard) Simulation time 0.000000
-> [1000.000000] (1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
-> [1000.000000] (1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [1000.000000] (job_job1@Bourassa) Finished job 1 (smpi_app 'job1')
-> [1000.000000] (maestro@) Simulation finished! Final time: 1000
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_sr_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_sr_noise.tesh
deleted file mode 100644
index 1bb16c5465..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_sr_noise.tesh
+++ /dev/null
@@ -1,27 +0,0 @@
-p Workload with two empty jobs (not at the same time, but on the same resources)
-! timeout 120
-! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
-> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
-> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
-> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=1000, alloc='0,1'
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
-> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
-> [   0.000000] (workload_executor@Bourassa) Sleeping 1000 seconds (waiting for job 1000, app 'job1')
-> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
-> [   0.000000] (0_1@Fafard) Simulation time 0.000000
-> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
-> [1000.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
-> [1000.000000] (job_job1@Bourassa) Executing job 1 (smpi_app 'job1')
-> [1000.000000] (1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
-> [1000.000000] (1_1@Fafard) Replaying rank 1 of job 1 (smpi_app 'job1')
-> [1000.000000] (1_0@Bourassa) Simulation time 0.000000
-> [1000.000000] (1_1@Fafard) Simulation time 0.000000
-> [1000.000000] (1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
-> [1000.000000] (1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [1000.000000] (job_job1@Bourassa) Finished job 1 (smpi_app 'job1')
-> [1013.000000] (maestro@) Simulation finished! Final time: 1013
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st.tesh
deleted file mode 100644
index 4bdf505f87..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st.tesh
+++ /dev/null
@@ -1,26 +0,0 @@
-p Workload with two empty jobs (at the same time but not on the same resources)
-! timeout 120
-! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
-> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
-> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
-> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='2,3'
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
-> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
-> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_job1@Ginette) Executing job 1 (smpi_app 'job1')
-> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (1_0@Ginette) Replaying rank 0 of job 1 (smpi_app 'job1')
-> [   0.000000] (1_1@Jupiter) Replaying rank 1 of job 1 (smpi_app 'job1')
-> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
-> [   0.000000] (0_1@Fafard) Simulation time 0.000000
-> [   0.000000] (1_0@Ginette) Simulation time 0.000000
-> [   0.000000] (1_1@Jupiter) Simulation time 0.000000
-> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
-> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
-> [   0.000000] (job_job1@Ginette) Finished job 1 (smpi_app 'job1')
-> [   0.000000] (maestro@) Simulation finished! Final time: 0
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st_noise.tesh
deleted file mode 100644
index 7af11cd9ad..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st_noise.tesh
+++ /dev/null
@@ -1,26 +0,0 @@
-p Workload with two empty jobs (at the same time but not on the same resources)
-! timeout 120
-! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
-> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
-> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
-> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='2,3'
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
-> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
-> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_job1@Ginette) Executing job 1 (smpi_app 'job1')
-> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (1_0@Ginette) Replaying rank 0 of job 1 (smpi_app 'job1')
-> [   0.000000] (1_1@Jupiter) Replaying rank 1 of job 1 (smpi_app 'job1')
-> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
-> [   0.000000] (0_1@Fafard) Simulation time 0.000000
-> [   0.000000] (1_0@Ginette) Simulation time 0.000000
-> [   0.000000] (1_1@Jupiter) Simulation time 0.000000
-> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (1_1@Jupiter) Finished replaying rank 1 of job 1 (smpi_app 'job1')
-> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (1_0@Ginette) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
-> [   0.000000] (job_job1@Ginette) Finished job 1 (smpi_app 'job1')
-> [  13.000000] (maestro@) Simulation finished! Final time: 13
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st_sr.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st_sr.tesh
deleted file mode 100644
index f58953e976..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st_sr.tesh
+++ /dev/null
@@ -1,26 +0,0 @@
-p Workload with two empty jobs (at the same time and on the same resources)
-! timeout 120
-! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
-> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
-> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
-> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='0,1'
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
-> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
-> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_job1@Bourassa) Executing job 1 (smpi_app 'job1')
-> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
-> [   0.000000] (1_1@Fafard) Replaying rank 1 of job 1 (smpi_app 'job1')
-> [   0.000000] (1_0@Bourassa) Simulation time 0.000000
-> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
-> [   0.000000] (1_1@Fafard) Simulation time 0.000000
-> [   0.000000] (0_1@Fafard) Simulation time 0.000000
-> [   0.000000] (1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
-> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_job1@Bourassa) Finished job 1 (smpi_app 'job1')
-> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
-> [   0.000000] (maestro@) Simulation finished! Final time: 0
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st_sr_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st_sr_noise.tesh
deleted file mode 100644
index 0f7eebf496..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_empty2_st_sr_noise.tesh
+++ /dev/null
@@ -1,26 +0,0 @@
-p Workload with two empty jobs (at the same time and on the same resources)
-! timeout 120
-! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_empty2_same_time_and_resources --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
-> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
-> [   0.000000] (maestro@) Job read: app='job0', file='empty.txt', size=2, start=0, alloc='0,1'
-> [   0.000000] (maestro@) Job read: app='job1', file='empty.txt', size=2, start=0, alloc='0,1'
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'job0')
-> [   0.000000] (job_job0@Bourassa) Executing job 0 (smpi_app 'job0')
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 1 (app 'job1')
-> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_job1@Bourassa) Executing job 1 (smpi_app 'job1')
-> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (1_0@Bourassa) Replaying rank 0 of job 1 (smpi_app 'job1')
-> [   0.000000] (1_1@Fafard) Replaying rank 1 of job 1 (smpi_app 'job1')
-> [   0.000000] (1_0@Bourassa) Simulation time 0.000000
-> [   0.000000] (0_0@Bourassa) Simulation time 0.000000
-> [   0.000000] (1_1@Fafard) Simulation time 0.000000
-> [   0.000000] (0_1@Fafard) Simulation time 0.000000
-> [   0.000000] (1_1@Fafard) Finished replaying rank 1 of job 1 (smpi_app 'job1')
-> [   0.000000] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'job0')
-> [   0.000000] (1_0@Bourassa) Finished replaying rank 0 of job 1 (smpi_app 'job1')
-> [   0.000000] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'job0')
-> [   0.000000] (job_job1@Bourassa) Finished job 1 (smpi_app 'job1')
-> [   0.000000] (job_job0@Bourassa) Finished job 0 (smpi_app 'job0')
-> [  13.000000] (maestro@) Simulation finished! Final time: 13
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh
index 9c2cf33d50..addb6cd840 100644
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1.tesh
@@ -1,7 +1,12 @@
 p Workload with one mixed job
+
+< One app alone
+< alone mixed.txt 2 0 0,1
+$ mkfile ${srcdir:=.}/workload_mixed1
+
 ! timeout 120
 ! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml  ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
+$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml  ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
 > [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
 > [   0.000000] (maestro@) Job read: app='alone', file='mixed.txt', size=2, start=0, alloc='0,1'
 > [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'alone')
@@ -13,3 +18,20 @@ $ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_rout
 > [ 737.001374] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'alone')
 > [ 737.001374] (job_alone@Bourassa) Finished job 0 (smpi_app 'alone')
 > [ 737.001374] (maestro@) Simulation finished! Final time: 737.001
+
+! timeout 120
+! output sort 19
+$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml  ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   0.000000] (maestro@) Job read: app='alone', file='mixed.txt', size=2, start=0, alloc='0,1'
+> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'alone')
+> [   0.000000] (job_alone@Bourassa) Executing job 0 (smpi_app 'alone')
+> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'alone')
+> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'alone')
+> [ 737.001374] (0_0@Bourassa) Simulation time 737.001374
+> [ 737.001374] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'alone')
+> [ 737.001374] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'alone')
+> [ 737.001374] (job_alone@Bourassa) Finished job 0 (smpi_app 'alone')
+> [ 737.001374] (maestro@) Simulation finished! Final time: 737.001
+
+$ rm -f ${srcdir:=.}/workload_mixed1
\ No newline at end of file
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1_noise.tesh
deleted file mode 100644
index b653ca3939..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_mixed1_noise.tesh
+++ /dev/null
@@ -1,15 +0,0 @@
-p Workload with one mixed job
-! timeout 120
-! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml  ${srcdir:=.}/workload_mixed1 --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
-> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
-> [   0.000000] (maestro@) Job read: app='alone', file='mixed.txt', size=2, start=0, alloc='0,1'
-> [   0.000000] (workload_executor@Bourassa) Launching the job executor of job 0 (app 'alone')
-> [   0.000000] (job_alone@Bourassa) Executing job 0 (smpi_app 'alone')
-> [   0.000000] (0_0@Bourassa) Replaying rank 0 of job 0 (smpi_app 'alone')
-> [   0.000000] (0_1@Fafard) Replaying rank 1 of job 0 (smpi_app 'alone')
-> [ 737.001374] (0_0@Bourassa) Simulation time 737.001374
-> [ 737.001374] (0_0@Bourassa) Finished replaying rank 0 of job 0 (smpi_app 'alone')
-> [ 737.001374] (0_1@Fafard) Finished replaying rank 1 of job 0 (smpi_app 'alone')
-> [ 737.001374] (job_alone@Bourassa) Finished job 0 (smpi_app 'alone')
-> [ 737.001374] (maestro@) Simulation finished! Final time: 737.001
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh
index 3d22a64bc5..d7ade0db82 100644
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh
+++ b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob.tesh
@@ -1,7 +1,16 @@
-# comment
 p Workload without any job
+
+< This workload does not compute any job.
+$ mkfile ${srcdir:=.}/workload_nojob
+
 ! timeout 120
-! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
+$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 0 0
 > [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
 > [   0.000000] (maestro@) Simulation finished! Final time: 0
+
+! timeout 120
+$ ./replay_multiple_manual ${platfdir}/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
+> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
+> [   7.000000] (maestro@) Simulation finished! Final time: 7
+
+$ rm -f ${srcdir:=.}/workload_nojob
\ No newline at end of file
diff --git a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob_noise.tesh b/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob_noise.tesh
deleted file mode 100644
index 60d850d8d4..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/replay_multiple_manual_nojob_noise.tesh
+++ /dev/null
@@ -1,7 +0,0 @@
-# comment
-p Workload without any job
-! timeout 120
-! output sort 19
-$ ./replay_multiple_manual ${srcdir:=.}/../../platforms/small_platform_with_routers.xml ${srcdir:=.}/workload_nojob --log=smpi.:info --cfg=smpi/host-speed:100 "--log=root.fmt:[%11.6r]%e(%P@%h)%e%m%n" 7 13
-> [   0.000000] (maestro@) Configuration change: Set 'smpi/host-speed' to '100'
-> [   7.000000] (maestro@) Simulation finished! Final time: 7
diff --git a/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_resources b/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_resources
deleted file mode 100644
index 00517450ea..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_resources
+++ /dev/null
@@ -1,4 +0,0 @@
-Two jobs not at the same time but using the same resources
-job0 empty.txt 2 0 0,1
-job1 empty.txt 2 1000 0,1
-
diff --git a/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time b/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time
deleted file mode 100644
index a14eb5f1b6..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time
+++ /dev/null
@@ -1,4 +0,0 @@
-Two jobs not at the same time but on different resources
-job0 empty.txt 2 0 0,1
-job1 empty.txt 2 0 2,3
-
diff --git a/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time_and_resources b/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time_and_resources
deleted file mode 100644
index 755fb8398e..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/workload_empty2_same_time_and_resources
+++ /dev/null
@@ -1,4 +0,0 @@
-Two jobs not at the same time but on different resources
-job0 empty.txt 2 0 0,1
-job1 empty.txt 2 0 0,1
-
diff --git a/examples/smpi/replay_multiple_manual_deploy/workload_mixed1 b/examples/smpi/replay_multiple_manual_deploy/workload_mixed1
deleted file mode 100644
index bdc65694a8..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/workload_mixed1
+++ /dev/null
@@ -1,2 +0,0 @@
-One app alone
-alone mixed.txt 2 0 0,1
diff --git a/examples/smpi/replay_multiple_manual_deploy/workload_nojob b/examples/smpi/replay_multiple_manual_deploy/workload_nojob
deleted file mode 100644
index f834b92784..0000000000
--- a/examples/smpi/replay_multiple_manual_deploy/workload_nojob
+++ /dev/null
@@ -1 +0,0 @@
-This workload does not compute any job.