This hack is not needed since gras is killed.

diff --git a/examples/msg/properties/msg_prop.c b/examples/msg/properties/msg_prop.c
index bdbbf08..242a8fa 100644 (file)
--- a/examples/msg/properties/msg_prop.c
+++ b/examples/msg/properties/msg_prop.c
@@ -43,7 +43,7 @@ static void test_host(const char*hostname)
   char *key, *data;
   const char *noexist = "Unknown";
   const char *value;
-  char exist[] = "SG_TEST_Hdd";
+  char exist[] = "Hdd";
 
   XBT_INFO("== Print the properties of the host");
   xbt_dict_foreach(props, cursor, key, data)

diff --git a/examples/msg/properties/msg_prop.tesh b/examples/msg/properties/msg_prop.tesh
index 244bf33..d6bb370 100644 (file)
--- a/examples/msg/properties/msg_prop.tesh
+++ b/examples/msg/properties/msg_prop.tesh
@@ -8,21 +8,21 @@ $ $SG_TEST_EXENV properties/msg_prop$EXEEXT ${srcdir:=.}/../platforms/prop.xml $
 > [  0.000000] (0:@) Host 'host1' runs at 1000000000 flops/s
 > [  0.000000] (0:@) Host 'host2' runs at 1000000000 flops/s
 > [  0.000000] (1:alice@host1) == Print the properties of the host
-> [  0.000000] (1:alice@host1)   Host property: 'SG_TEST_Hdd' -> '180'
-> [  0.000000] (1:alice@host1)   Host property: 'SG_TEST_mem' -> '4'
+> [  0.000000] (1:alice@host1)   Host property: 'mem' -> '4'
+> [  0.000000] (1:alice@host1)   Host property: 'Hdd' -> '180'
 > [  0.000000] (1:alice@host1) == Try to get a host property that does not exist
 > [  0.000000] (1:alice@host1) == Try to get a host property that does exist
-> [  0.000000] (1:alice@host1)    Property: SG_TEST_Hdd old value: 180
+> [  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: SG_TEST_Hdd old value: 250
+> [  0.000000] (1:alice@host1)    Property: Hdd old value: 250
 > [  0.000000] (2:bob@host1) == Print the properties of the process
 > [  0.000000] (2:bob@host1)    Process property: SomeProp -> SomeValue
 > [  0.000000] (2:bob@host1) == Try to get a process property that does not exist
 > [  1.000000] (3:carole@host2) == Print the properties of the host
-> [  1.000000] (3:carole@host2)   Host property: 'SG_TEST_Hdd' -> '180'
-> [  1.000000] (3:carole@host2)   Host property: 'SG_TEST_mem' -> '4'
+> [  1.000000] (3:carole@host2)   Host property: 'mem' -> '4'
+> [  1.000000] (3:carole@host2)   Host property: 'Hdd' -> '180'
 > [  1.000000] (3:carole@host2) == Try to get a host property that does not exist
 > [  1.000000] (3:carole@host2) == Try to get a host property that does exist
-> [  1.000000] (3:carole@host2)    Property: SG_TEST_Hdd old value: 180
+> [  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: SG_TEST_Hdd old value: 250
+> [  1.000000] (3:carole@host2)    Property: Hdd old value: 250

diff --git a/examples/platforms/prop.xml b/examples/platforms/prop.xml
index b41fe4d..ac206ca 100644 (file)
--- a/examples/platforms/prop.xml
+++ b/examples/platforms/prop.xml
@@ -5,12 +5,6 @@
       to define some properties on hosts, processes and links. 
       It is used in several regression cases on properties -->
  
- <!-- Some properties' name is prefixed by SG_TEST_ only to simplify
-      the test of GRAS on real life: we don't want to display the whole
-      user's environment here, only the ones related to the test.
-      
-      Of course, this restriction is not needed in your own platforms. -->
- 
  <platform version="3">
  <AS  id="AS0"  routing="Full">
    <prop id="filename" value="prop.xml"/>
@@ -29,12 +23,12 @@
    
    <AS  id="AS4"  routing="Full">
           <host id="host1" power="1000000000">
-            <prop id="SG_TEST_Hdd" value="180"/>
-            <prop id="SG_TEST_mem" value="4"/>
+            <prop id="Hdd" value="180"/>
+            <prop id="mem" value="4"/>
           </host>
           
           <host id="host2" power="1000000000">
-            <prop id="SG_TEST_Hdd" value="120"/>
+            <prop id="Hdd" value="120"/>
           </host>
           
           <link id="l1" bandwidth="125000000" latency="0.000100">

diff --git a/examples/simdag/properties/sd_prop.c b/examples/simdag/properties/sd_prop.c
index 06f4e75..67c3951 100644 (file)
--- a/examples/simdag/properties/sd_prop.c
+++ b/examples/simdag/properties/sd_prop.c
@@ -26,7 +26,7 @@ int main(int argc, char **argv)
   char *key, *data;
   char noexist[] = "NoProp";
   const char *value;
-  char exist[] = "SG_TEST_Hdd";
+  char exist[] = "Hdd";
 
   /* initialisation of SD */
   SD_init(&argc, argv);

diff --git a/examples/simdag/properties/test_prop.tesh b/examples/simdag/properties/test_prop.tesh
index f08e9b9..6def7e0 100755 (executable)
--- a/examples/simdag/properties/test_prop.tesh
+++ b/examples/simdag/properties/test_prop.tesh
@@ -5,19 +5,19 @@ p Simple test of simdag with properties
 $ $SG_TEST_EXENV properties/sd_prop ${srcdir:=.}/../platforms/prop.xml
 > [0.000000] [surf_workstation/INFO] surf_workstation_model_init_ptask_L07
 > [0.000000] [test/INFO] Property list for workstation host1
+> [0.000000] [test/INFO]       Property: mem has value: 4
 > [0.000000] [test/INFO]       Property: NewProp has value: newValue
-> [0.000000] [test/INFO]       Property: SG_TEST_Hdd has value: 180
-> [0.000000] [test/INFO]       Property: SG_TEST_mem has value: 4
+> [0.000000] [test/INFO]       Property: Hdd has value: 180
 > [0.000000] [test/INFO]       Property: NoProp is undefined
 > [0.000000] [test/INFO] Property list for workstation host2
-> [0.000000] [test/INFO]       Property: SG_TEST_Hdd on host: 120
+> [0.000000] [test/INFO]       Property: Hdd on host: 120
 > [0.000000] [test/INFO] Modify an existing property
-> [0.000000] [test/INFO]       Property: SG_TEST_Hdd old value: 120
-> [0.000000] [test/INFO]       Property: SG_TEST_Hdd new value: 250
+> [0.000000] [test/INFO]       Property: Hdd old value: 120
+> [0.000000] [test/INFO]       Property: Hdd new value: 250
 > [0.000000] [sd_workstation/INFO] Displaying workstation host2
 > [0.000000] [sd_workstation/INFO]   - power: 1000000000
 > [0.000000] [sd_workstation/INFO]   - available power: 1.00
 > [0.000000] [sd_workstation/INFO]   - access mode: Exclusive
 > [0.000000] [sd_workstation/INFO]     no task running
 > [0.000000] [sd_workstation/INFO]   - properties:
-> [0.000000] [sd_workstation/INFO]     SG_TEST_Hdd->250
+> [0.000000] [sd_workstation/INFO]     Hdd->250