X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e2bbcbb5234f082ba98ab9380baf2185f4791f7b..8be118f09371c1e9fb4bdac52f6c7dad1fff44d8:/examples/s4u/platform-properties/s4u-platform-properties.tesh

diff --git a/examples/s4u/platform-properties/s4u-platform-properties.tesh b/examples/s4u/platform-properties/s4u-platform-properties.tesh
index b9997e5669..f9a14b8093 100644
--- a/examples/s4u/platform-properties/s4u-platform-properties.tesh
+++ b/examples/s4u/platform-properties/s4u-platform-properties.tesh
@@ -1,18 +1,18 @@
-#! ./tesh
+#!/usr/bin/env tesh
 
 p Testing a S4U application with properties in the XML for Hosts, Links and Actors
 
 ! output sort 19
-$ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-properties$EXEEXT ${srcdir:=.}/prop.xml ${srcdir:=.}/../s4u/platform-properties/s4u-platform-properties_d.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ${bindir:=.}/s4u-platform-properties ${platfdir}/prop.xml s4u-platform-properties_d.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) There are 7 hosts in the environment
 > [  0.000000] (0:maestro@) Host 'host1' runs at 1000000000 flops/s
 > [  0.000000] (0:maestro@) Host 'host2' runs at 1000000000 flops/s
-> [  0.000000] (0:maestro@) Host 'node-0.acme.org' runs at 1000000000 flops/s
-> [  0.000000] (0:maestro@) Host 'node-1.acme.org' runs at 1000000000 flops/s
-> [  0.000000] (0:maestro@) Host 'node-2.acme.org' runs at 1000000000 flops/s
-> [  0.000000] (0:maestro@) Host 'node-3.acme.org' runs at 1000000000 flops/s
-> [  0.000000] (0:maestro@) Host 'node-4.acme.org' runs at 1000000000 flops/s
-> [  0.000000] (2:bob@host1) == Print the properties of the zone
+> [  0.000000] (0:maestro@) Host 'node-0.simgrid.org' runs at 1000000000 flops/s
+> [  0.000000] (0:maestro@) Host 'node-1.simgrid.org' runs at 1000000000 flops/s
+> [  0.000000] (0:maestro@) Host 'node-2.simgrid.org' runs at 1000000000 flops/s
+> [  0.000000] (0:maestro@) Host 'node-3.simgrid.org' runs at 1000000000 flops/s
+> [  0.000000] (0:maestro@) Host 'node-4.simgrid.org' runs at 1000000000 flops/s
+> [  0.000000] (2:bob@host1) == Print the properties of the root zone
 > [  0.000000] (2:bob@host1)    Zone property: filename -> prop.xml
 > [  0.000000] (2:bob@host1)    Zone property: date -> 31-08-12
 > [  0.000000] (2:bob@host1)    Zone property: author -> pnavarro
@@ -27,6 +27,8 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-properties$EXEEXT ${srcdir:=.}/prop.x
 > [  0.000000] (1:alice@host1)    Property: Hdd old value: 180
 > [  0.000000] (1:alice@host1) == Trying to modify a host property
 > [  0.000000] (1:alice@host1)    Property: Hdd old value: 250
+> [  0.000000] (1:alice@host1) == Print the properties of the zone 'AS4' that contains 'host1'
+> [  0.000000] (1:alice@host1)   Zone property: 'bla' -> 'bli'
 > [  1.000000] (3:carole@host2) == Print the properties of the host 'host1'
 > [  1.000000] (3:carole@host2)   Host property: 'Hdd' -> '180'
 > [  1.000000] (3:carole@host2)   Host property: 'mem' -> '4'
@@ -35,7 +37,9 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-properties$EXEEXT ${srcdir:=.}/prop.x
 > [  1.000000] (3:carole@host2)    Property: Hdd old value: 180
 > [  1.000000] (3:carole@host2) == Trying to modify a host property
 > [  1.000000] (3:carole@host2)    Property: Hdd old value: 250
-> [  2.000000] (4:david@host2) == Print the properties of the host 'node-0.acme.org'
+> [  1.000000] (3:carole@host2) == Print the properties of the zone 'AS4' that contains 'host1'
+> [  1.000000] (3:carole@host2)   Zone property: 'bla' -> 'bli'
+> [  2.000000] (4:david@host2) == Print the properties of the host 'node-0.simgrid.org'
 > [  2.000000] (4:david@host2)   Host property: 'Hdd' -> '180'
 > [  2.000000] (4:david@host2)   Host property: 'bla' -> 'acme cluster'
 > [  2.000000] (4:david@host2)   Host property: 'mem' -> '42'
@@ -44,3 +48,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/s4u-platform-properties$EXEEXT ${srcdir:=.}/prop.x
 > [  2.000000] (4:david@host2)    Property: Hdd old value: 180
 > [  2.000000] (4:david@host2) == Trying to modify a host property
 > [  2.000000] (4:david@host2)    Property: Hdd old value: 250
+> [  2.000000] (4:david@host2) == Print the properties of the zone 'acme' that contains 'node-0.simgrid.org'
+> [  2.000000] (4:david@host2)   Zone property: 'Hdd' -> '180'
+> [  2.000000] (4:david@host2)   Zone property: 'bla' -> 'acme cluster'
+> [  2.000000] (4:david@host2)   Zone property: 'mem' -> '42'