Update tesh for mc.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9372 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index e2ce5ab..eecd9c4 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -229,9 +229,9 @@ endif(enable_smpi)
                                                                
 # examples/msg/mc
 if(HAVE_MC)
-ADD_TEST(mc-bugged1                    ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
-ADD_TEST(mc-bugged2                    ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
-ADD_TEST(mc-centralized                ${CMAKE_BINARY_DIR}/bin/tesh --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
+ADD_TEST(mc-bugged1                    ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1.tesh)
+ADD_TEST(mc-bugged2                    ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged2.tesh)
+ADD_TEST(mc-centralized                ${CMAKE_BINARY_DIR}/bin/tesh --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc        --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc centralized.tesh)
 endif(HAVE_MC)
 
 

diff --git a/examples/msg/mc/bugged1.tesh b/examples/msg/mc/bugged1.tesh
index e48047d..7ce5510 100644 (file)
--- a/examples/msg/mc/bugged1.tesh
+++ b/examples/msg/mc/bugged1.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 
 ! output sort
-$ ./bugged1 --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+$ ${bindir:=.}/bugged1 --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
 > [  0.008753] (2:client@HostB) Sent!
 > [  0.017506] (3:client@HostC) Sent!
 > [  0.026259] (1:server@HostA) OK

diff --git a/examples/msg/mc/bugged2.tesh b/examples/msg/mc/bugged2.tesh
index e69de29..6471f03 100644 (file)
--- a/examples/msg/mc/bugged2.tesh
+++ b/examples/msg/mc/bugged2.tesh
@@ -0,0 +1,13 @@
+#! ./tesh
+
+! output sort
+$ ${bindir:=.}/bugged2 --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n
+> [  0.000000] (2:client@HostB) Send 1!
+> [  0.000000] (3:client@HostC) Send 2!
+> [  0.008753] (1:server@HostA) Received 1
+> [  0.008753] (2:client@HostB) Send 1!
+> [  0.017506] (1:server@HostA) Received 2
+> [  0.017506] (3:client@HostC) Send 2!
+> [  0.026259] (1:server@HostA) Received 1
+> [  0.035012] (1:server@HostA) Received 2
+> [  0.035012] (1:server@HostA) OK

diff --git a/examples/msg/mc/centralized.tesh b/examples/msg/mc/centralized.tesh
index 843d571..1e14eb3 100644 (file)
--- a/examples/msg/mc/centralized.tesh
+++ b/examples/msg/mc/centralized.tesh
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ ./centralized
+$ ${bindir:=.}/centralized
 > [Fafard:client:(2) 0.000000] [centralized/INFO] Ask the request
 > [Boivin:client:(3) 0.000000] [centralized/INFO] Ask the request
 > [TeX:client:(4) 0.000000] [centralized/INFO] Ask the request