Remove unused tesh (copied from sendrecv), add a real tesh for chainsend

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index f530f1b..dc02cc0 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -100,6 +100,7 @@ if(NOT enable_memcheck)
   # MSG examples
   ADD_TEST(msg-file                             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/msg/io/io.tesh)
   ADD_TEST(msg-start-kill-time                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time/start_kill_time.tesh)
+  ADD_TEST(msg-chainsend                        ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/chainsend --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg/chainsend --cd ${CMAKE_HOME_DIRECTORY}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/chainsend/chainsend.tesh)
 
   ADD_TEST(msg-sendrecv-CLM03-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
   ADD_TEST(msg-sendrecv-Vegas-thread            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)

diff --git a/examples/msg/chainsend/CMakeLists.txt b/examples/msg/chainsend/CMakeLists.txt
index 40e6701..56d68bb 100644 (file)
--- a/examples/msg/chainsend/CMakeLists.txt
+++ b/examples/msg/chainsend/CMakeLists.txt
@@ -9,10 +9,7 @@ target_link_libraries(chainsend simgrid m )
 
 set(tesh_files
   ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/chainsend_CLM03.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/chainsend_KCCFLN05.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/chainsend_Reno.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/chainsend_Vegas.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/chainsend.tesh
   PARENT_SCOPE
   )
 set(xml_files

diff --git a/examples/msg/chainsend/chainsend_CLM03.tesh b/examples/msg/chainsend/chainsend_CLM03.tesh
deleted file mode 100644 (file)
index a5832ef..0000000
--- a/examples/msg/chainsend/chainsend_CLM03.tesh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! ./tesh
-
-p Testing the deprecated CM02 network model
-
-! output sort
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
->  [  0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01'
-> [  0.000000] (0:@) Configuration change: Set 'network/model' to 'CM02'
-> [  0.000000] (0:@) test_all
-> [  0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s)
-> [  0.000000] (1:sender@Inmos) sender
-> [  0.000000] (1:sender@Inmos) host = Bellevue
-> [  0.000000] (1:sender@Inmos) task_la->data = 0.000000e+00
-> [  0.000000] (2:receiver@Bellevue) receiver
-> [  0.100100] (1:sender@Inmos) task_bw->data = 1.001000e-01
-> [  0.100100] (2:receiver@Bellevue) Task received : latency task
-> [  0.100100] (2:receiver@Bellevue) Communic. time 1.001000e-01
-> [  0.100100] (2:receiver@Bellevue) --- la 0.100100 ----
-> [10000.200100] (0:@) Total simulation time: 1.000020e+04
-> [10000.200100] (2:receiver@Bellevue) Task received : bandwidth task
-> [10000.200100] (2:receiver@Bellevue) Communic. time 1.000010e+04
-> [10000.200100] (2:receiver@Bellevue) --- bw 99999.000010 ----
\ No newline at end of file

diff --git a/examples/msg/chainsend/chainsend_KCCFLN05.tesh b/examples/msg/chainsend/chainsend_KCCFLN05.tesh
deleted file mode 100644 (file)
index 2355d9c..0000000
--- a/examples/msg/chainsend/chainsend_KCCFLN05.tesh
+++ /dev/null
@@ -1,18 +0,0 @@
-#! ./tesh
-
-p Testing the surf network maxmin fairness model
-
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml
-> [0.000000] [msg_test/INFO] test_all
-> [Inmos:sender:(1) 0.000000] [msg_test/INFO] sender
-> [Inmos:sender:(1) 0.000000] [msg_test/INFO] host = Bellevue
-> [Inmos:sender:(1) 0.000000] [msg_test/INFO] task_la->data = 0.000000e+00
-> [Bellevue:receiver:(2) 0.000000] [msg_test/INFO] receiver
-> [Inmos:sender:(1) 0.100100] [msg_test/INFO] task_bw->data = 1.001000e-01
-> [Bellevue:receiver:(2) 0.100100] [msg_test/INFO] Task received : latency task
-> [Bellevue:receiver:(2) 0.100100] [msg_test/INFO] Communic. time 1.001000e-01
-> [Bellevue:receiver:(2) 0.100100] [msg_test/INFO] --- la 0.100100 ----
-> [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] Task received : bandwidth task
-> [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] Communic. time 1.000010e+04
-> [Bellevue:receiver:(2) 10000.200100] [msg_test/INFO] --- bw 99999.000010 ----
-> [10000.200100] [msg_test/INFO] Total simulation time: 1.000020e+04

diff --git a/examples/msg/chainsend/chainsend_Reno.tesh b/examples/msg/chainsend/chainsend_Reno.tesh
deleted file mode 100644 (file)
index e4eb2bb..0000000
--- a/examples/msg/chainsend/chainsend_Reno.tesh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! ./tesh
-
-p Testing the surf network Reno fairness model using lagrangian approach
-
-! output sort
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound'
-> [  0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01'
-> [  0.000000] (0:@) Configuration change: Set 'network/model' to 'Reno'
-> [  0.000000] (0:@) test_all
-> [  0.000000] (1:sender@Inmos) sender
-> [  0.000000] (1:sender@Inmos) host = Bellevue
-> [  0.000000] (1:sender@Inmos) task_la->data = 0.000000e+00
-> [  0.000000] (2:receiver@Bellevue) receiver
-> [  1.040100] (1:sender@Inmos) task_bw->data = 1.040100e+00
-> [  1.040100] (2:receiver@Bellevue) Task received : latency task
-> [  1.040100] (2:receiver@Bellevue) Communic. time 1.040100e+00
-> [  1.040100] (2:receiver@Bellevue) --- la 1.040100 ----
-> [10002.080100] (0:@) Total simulation time: 1.000208e+04
-> [10002.080100] (2:receiver@Bellevue) Task received : bandwidth task
-> [10002.080100] (2:receiver@Bellevue) Communic. time 1.000104e+04
-> [10002.080100] (2:receiver@Bellevue) --- bw 99989.601081 ----

diff --git a/examples/msg/chainsend/chainsend_Vegas.tesh b/examples/msg/chainsend/chainsend_Vegas.tesh
deleted file mode 100644 (file)
index b742fa4..0000000
--- a/examples/msg/chainsend/chainsend_Vegas.tesh
+++ /dev/null
@@ -1,22 +0,0 @@
-#! ./tesh
-
-p Testing the surf network Vegas fairness model using lagrangian approach
-
-! output sort
-$ $SG_TEST_EXENV sendrecv/sendrecv$EXEEXT ${srcdir:=.}/sendrecv/platform_sendrecv.xml ${srcdir:=.}/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:@) Configuration change: Set 'workstation/model' to 'compound'
-> [  0.000000] (0:@) Configuration change: Set 'cpu/model' to 'Cas01'
-> [  0.000000] (0:@) Configuration change: Set 'network/model' to 'Vegas'
-> [  0.000000] (0:@) test_all
-> [  0.000000] (1:sender@Inmos) sender
-> [  0.000000] (1:sender@Inmos) host = Bellevue
-> [  0.000000] (1:sender@Inmos) task_la->data = 0.000000e+00
-> [  0.000000] (2:receiver@Bellevue) receiver
-> [  1.040100] (1:sender@Inmos) task_bw->data = 1.040100e+00
-> [  1.040100] (2:receiver@Bellevue) Task received : latency task
-> [  1.040100] (2:receiver@Bellevue) Communic. time 1.040100e+00
-> [  1.040100] (2:receiver@Bellevue) --- la 1.040100 ----
-> [10002.080100] (0:@) Total simulation time: 1.000208e+04
-> [10002.080100] (2:receiver@Bellevue) Task received : bandwidth task
-> [10002.080100] (2:receiver@Bellevue) Communic. time 1.000104e+04
-> [10002.080100] (2:receiver@Bellevue) --- bw 99989.601081 ----