X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba9a4cfeba4eb00e84cd17603fc9654e81445655..d9d41ca279bd3e0a057f982bda214394295e00dc:/teshsuite/surf/surf_usage/surf_usage.tesh

diff --git a/teshsuite/surf/surf_usage/surf_usage.tesh b/teshsuite/surf/surf_usage/surf_usage.tesh
index c51400e2bd..4e60bff41c 100644
--- a/teshsuite/surf/surf_usage/surf_usage.tesh
+++ b/teshsuite/surf/surf_usage/surf_usage.tesh
@@ -1,16 +1,16 @@
 #! ./tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/surf_usage ../../examples/platforms/two_hosts_platform_with_availability.xml
+$ $SG_TEST_EXENV ${bindir:=.}/surf_usage ${srcdir:=.}/../../../examples/platforms/two_hosts_platform_with_availability.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
 > [0.000000] [surf_test/INFO] actionA state: SURF_ACTION_RUNNING
 > [0.000000] [surf_test/INFO] actionB state: SURF_ACTION_RUNNING
 > [0.000000] [surf_test/INFO] actionC state: SURF_ACTION_RUNNING
-> [0.000000] [surf_test/INFO] Next Event : 0
-> [0.000000] [surf_test/INFO]    CPU Failed action
 > [0.200000] [surf_test/INFO] Next Event : 0.2
-> [0.200015] [surf_test/INFO] Next Event : 0.200015
-> [0.200015] [surf_test/INFO]    Network Failed action
+> [0.200016] [surf_test/INFO] Next Event : 0.200016
+> [0.200016] [surf_test/INFO]    Network Done action
+> [1.000000] [surf_test/INFO] Next Event : 1
+> [1.000000] [surf_test/INFO]    CPU Failed action
 > [7.320000] [surf_test/INFO] Next Event : 7.32
 > [7.320000] [surf_test/INFO]    CPU Done action
 > [10.000000] [surf_test/INFO] Next Event : 10
@@ -26,36 +26,5 @@ $ $SG_TEST_EXENV ${bindir:=.}/surf_usage ../../examples/platforms/two_hosts_plat
 > [110.000000] [surf_test/INFO] Next Event : 110
 > [120.000000] [surf_test/INFO] Next Event : 120
 > [130.000000] [surf_test/INFO] Next Event : 130
-> [140.000000] [surf_test/INFO] Next Event : 140
-> [150.000000] [surf_test/INFO] Next Event : 150
-> [157.500000] [surf_test/INFO] Next Event : 157.5
-> [157.500000] [surf_test/INFO]    CPU Done action
-
-$ $SG_TEST_EXENV ${bindir:=.}/surf_usage2  ../../examples/platforms/two_hosts_platform_with_availability.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
-> [0.000000] [surf_test/INFO] Next Event : 0
-> [0.000000] [surf_test/INFO]    * Done Action
-> [0.200000] [surf_test/INFO] Next Event : 0.2
-> [0.200015] [surf_test/INFO] Next Event : 0.200015
-> [0.200015] [surf_test/INFO]    * Done Action
-> [7.320000] [surf_test/INFO] Next Event : 7.32
-> [7.320000] [surf_test/INFO]    * Done Action
-> [10.000000] [surf_test/INFO] Next Event : 10
-> [20.000000] [surf_test/INFO] Next Event : 20
-> [30.000000] [surf_test/INFO] Next Event : 30
-> [40.000000] [surf_test/INFO] Next Event : 40
-> [50.000000] [surf_test/INFO] Next Event : 50
-> [60.000000] [surf_test/INFO] Next Event : 60
-> [70.000000] [surf_test/INFO] Next Event : 70
-> [80.000000] [surf_test/INFO] Next Event : 80
-> [90.000000] [surf_test/INFO] Next Event : 90
-> [100.000000] [surf_test/INFO] Next Event : 100
-> [110.000000] [surf_test/INFO] Next Event : 110
-> [120.000000] [surf_test/INFO] Next Event : 120
-> [130.000000] [surf_test/INFO] Next Event : 130
-> [140.000000] [surf_test/INFO] Next Event : 140
-> [150.000000] [surf_test/INFO] Next Event : 150
-> [157.500000] [surf_test/INFO] Next Event : 157.5
-> [157.500000] [surf_test/INFO]    * Done Action
-> [157.500000] [surf_test/INFO] Simulation Terminated
+> [132.500000] [surf_test/INFO] Next Event : 132.5
+> [132.500000] [surf_test/INFO]    CPU Done action