Update the vivaldi test.

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

diff --git a/examples/msg/masterslave/masterslave_vivaldi.tesh b/examples/msg/masterslave/masterslave_vivaldi.tesh
index f80edd9..4e652a5 100644 (file)
--- a/examples/msg/masterslave/masterslave_vivaldi.tesh
+++ b/examples/msg/masterslave/masterslave_vivaldi.tesh
@@ -2,7 +2,7 @@
 
 p Testing a simple master/slave example application
 
 
 p Testing a simple master/slave example application
 

-$ $SG_TEST_EXENV ./masterslave/masterslave_mailbox --cfg=network/model:Vivaldi ../platforms/vivaldi.xml ./masterslave/deployment_masterslave_vivaldi.xml
+$ $SG_TEST_EXENV ./masterslave/masterslave_mailbox  ../platforms/vivaldi.xml ./masterslave/deployment_masterslave_vivaldi.xml

 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vivaldi'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [0.000000] [surf_network/INFO] Blih
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vivaldi'
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [0.000000] [surf_network/INFO] Blih

diff --git a/examples/platforms/vivaldi.xml b/examples/platforms/vivaldi.xml
index 42f8ffe..ed7b99a 100644 (file)
--- a/examples/platforms/vivaldi.xml
+++ b/examples/platforms/vivaldi.xml
@@ -42,5 +42,6 @@
        <host id="100422926" coordinates="-23.1 -7.6 39.9" power="1600000000.0" />
        <host id="100427449" coordinates="135.5 -21.0 83.4" power="1400000000.0" />
        <host id="100429957" coordinates="17.5 6.7 18.8" power="830000000.0" />
        <host id="100422926" coordinates="-23.1 -7.6 39.9" power="1600000000.0" />
        <host id="100427449" coordinates="135.5 -21.0 83.4" power="1400000000.0" />
        <host id="100429957" coordinates="17.5 6.7 18.8" power="830000000.0" />

+       <route src=".*" dst=".*"></route>

        </AS>
 </platform>
        </AS>
 </platform>