make this test test something

and move it to its own dir

diff --git a/examples/msg/CMakeLists.txt b/examples/msg/CMakeLists.txt
index 50f6df3..1be8806 100644 (file)
--- a/examples/msg/CMakeLists.txt
+++ b/examples/msg/CMakeLists.txt
@@ -1,8 +1,8 @@
 foreach(x actions-mpi actions-storage async-wait async-waitall async-waitany dht-chord dht-pastry 
           exception energy-consumption energy-onoff energy-pstate energy-ptask energy-vm failures io-file io-file-unlink
           io-remote io-storage pmm priority process-kill process-migration process-suspend properties sendrecv
-          set-maestro start_kill_time synchro token_ring 
-          trace-categories trace-link-srcdst-user-variables trace-platform trace-simple trace-user-variables)
+          set-maestro start_kill_time synchro token_ring trace-categories trace-link-srcdst-user-variables 
+          trace-link-user-variables trace-platform trace-simple trace-user-variables)
   add_executable       (${x}     ${x}/${x}.c)
   target_link_libraries(${x}     simgrid)
   set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
@@ -65,7 +65,7 @@ foreach (example consumption onoff pstate vm)
   ADD_TESH_FACTORIES(msg-energy-${example} "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/energy-${example}/energy-${example}.tesh)
 endforeach()
 
-foreach (x categories link-srcdst-user-variables platform simple user-variables)
+foreach (x categories link-srcdst-user-variables link-user-variables platform simple user-variables)
   ADD_TESH(msg-trace-${x} --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/trace-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/trace-${x} trace-${x}.tesh)
 endforeach()
 

diff --git a/examples/msg/tracing/link_user_variables.c b/examples/msg/trace-link-user-variables/trace-link-user-variables.c
similarity index 94%
rename from examples/msg/tracing/link_user_variables.c
rename to examples/msg/trace-link-user-variables/trace-link-user-variables.c
index 5c08fc6..cb9f44f 100644 (file)
--- a/examples/msg/tracing/link_user_variables.c
+++ b/examples/msg/trace-link-user-variables/trace-link-user-variables.c
@@ -60,10 +60,8 @@ static int master(int argc, char *argv[])
 int main(int argc, char *argv[])
 {
   MSG_init(&argc, argv);
-  if (argc < 3) {
-    printf("Usage: %s platform_file deployment_file\n", argv[0]);
-    exit(1);
-  }
+  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
+             "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
 

diff --git a/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh b/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh
new file mode 100644 (file)
index 0000000..bdf9177
--- /dev/null
+++ b/examples/msg/trace-link-user-variables/trace-link-user-variables.tesh
@@ -0,0 +1,485 @@
+#! ./tesh
+
+p Trace user variables associated to links of the platform file
+$ $SG_TEST_EXENV ${bindir:=.}/trace-link-user-variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/small_platform.xml ${srcdir:=.}/../msg/masterslave/deployment_masterslave_mailbox.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'
+
+$ tail -n +3 simgrid.trace
+> %EventDef PajeDefineContainerType 0
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineVariableType 1
+> %       Alias string
+> %       Type string
+> %       Name string
+> %       Color color
+> %EndEventDef
+> %EventDef PajeDefineStateType 2
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineEventType 3
+> %       Alias string
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineLinkType 4
+> %       Alias string
+> %       Type string
+> %       StartContainerType string
+> %       EndContainerType string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDefineEntityValue 5
+> %       Alias string
+> %       Type string
+> %       Name string
+> %       Color color
+> %EndEventDef
+> %EventDef PajeCreateContainer 6
+> %       Time date
+> %       Alias string
+> %       Type string
+> %       Container string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeDestroyContainer 7
+> %       Time date
+> %       Type string
+> %       Name string
+> %EndEventDef
+> %EventDef PajeSetVariable 8
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
+> %EndEventDef
+> %EventDef PajeAddVariable 9
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
+> %EndEventDef
+> %EventDef PajeSubVariable 10
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value double
+> %EndEventDef
+> %EventDef PajeSetState 11
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %EndEventDef
+> %EventDef PajePushState 12
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %EndEventDef
+> %EventDef PajePopState 13
+> %       Time date
+> %       Type string
+> %       Container string
+> %EndEventDef
+> %EventDef PajeResetState 14
+> %       Time date
+> %       Type string
+> %       Container string
+> %EndEventDef
+> %EventDef PajeStartLink 15
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %       StartContainer string
+> %       Key string
+> %EndEventDef
+> %EventDef PajeEndLink 16
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %       EndContainer string
+> %       Key string
+> %EndEventDef
+> %EventDef PajeNewEvent 17
+> %       Time date
+> %       Type string
+> %       Container string
+> %       Value string
+> %EndEventDef
+> 0 1 0 HOST
+> 6 0 1 1 0 "Tremblay"
+> 1 2 1 power "1 1 1"
+> 6 0 2 1 0 "Jupiter"
+> 6 0 3 1 0 "Fafard"
+> 6 0 4 1 0 "Ginette"
+> 6 0 5 1 0 "Bourassa"
+> 0 3 0 LINK
+> 6 0 6 3 0 "6"
+> 1 4 3 bandwidth "1 1 1"
+> 1 5 3 latency "1 1 1"
+> 6 0 7 3 0 "3"
+> 6 0 8 3 0 "7"
+> 6 0 9 3 0 "9"
+> 6 0 10 3 0 "2"
+> 6 0 11 3 0 "8"
+> 6 0 12 3 0 "1"
+> 6 0 13 3 0 "4"
+> 6 0 14 3 0 "0"
+> 6 0 15 3 0 "5"
+> 6 0 16 3 0 "loopback"
+> 4 6 0 3 3 0-LINK3-LINK3
+> 4 7 0 1 3 0-HOST1-LINK3
+> 4 8 0 3 1 0-LINK3-HOST1
+> 8 0 2 1 98095000.000000
+> 8 0 2 2 76296000.000000
+> 8 0 2 3 76296000.000000
+> 8 0 2 4 48492000.000000
+> 8 0 2 5 48492000.000000
+> 8 0 4 6 41279125.000000
+> 8 0 5 6 0.000060
+> 8 0 4 7 34285625.000000
+> 8 0 5 7 0.000514
+> 8 0 4 8 11618875.000000
+> 8 0 5 8 0.000190
+> 8 0 4 9 7209750.000000
+> 8 0 5 9 0.001462
+> 8 0 4 10 118682500.000000
+> 8 0 5 10 0.000137
+> 8 0 4 11 8158000.000000
+> 8 0 5 11 0.000271
+> 8 0 4 12 34285625.000000
+> 8 0 5 12 0.000514
+> 8 0 4 13 10099625.000000
+> 8 0 5 13 0.000480
+> 8 0 4 14 41279125.000000
+> 8 0 5 14 0.000060
+> 8 0 4 15 27946250.000000
+> 8 0 5 15 0.000278
+> 8 0 4 16 498000000.000000
+> 8 0 5 16 0.000015
+> 15 0 6 0 topology 13 0
+> 16 0 6 0 topology 7 0
+> 15 0 6 0 topology 6 1
+> 16 0 6 0 topology 8 1
+> 15 0 7 0 topology 1 2
+> 16 0 7 0 topology 13 2
+> 15 0 7 0 topology 1 3
+> 16 0 7 0 topology 9 3
+> 15 0 8 0 topology 9 4
+> 16 0 8 0 topology 2 4
+> 15 0 6 0 topology 10 5
+> 16 0 6 0 topology 14 5
+> 15 0 6 0 topology 12 6
+> 16 0 6 0 topology 11 6
+> 15 0 6 0 topology 9 7
+> 16 0 6 0 topology 13 7
+> 15 0 8 0 topology 8 8
+> 16 0 8 0 topology 5 8
+> 15 0 6 0 topology 14 9
+> 16 0 6 0 topology 12 9
+> 15 0 8 0 topology 15 10
+> 16 0 8 0 topology 4 10
+> 15 0 6 0 topology 10 11
+> 16 0 6 0 topology 15 11
+> 15 0 6 0 topology 7 12
+> 16 0 6 0 topology 15 12
+> 15 0 8 0 topology 11 13
+> 16 0 8 0 topology 3 13
+> 15 0 6 0 topology 7 14
+> 16 0 6 0 topology 10 14
+> 15 0 6 0 topology 12 15
+> 16 0 6 0 topology 6 15
+> 15 0 6 0 topology 11 16
+> 16 0 6 0 topology 6 16
+> 1 9 3 Link_Capacity "1 1 1"
+> 1 10 3 Link_Utilization "0.9 0.1 0.1"
+> 8 0 9 6 12.340000
+> 8 0 9 7 56.780000
+> 8 0 10 7 1.200000
+> 8 0 10 6 3.400000
+> 8 0 9 6 12.340000
+> 8 0 9 7 56.780000
+> 8 0 10 7 1.200000
+> 8 0 10 6 3.400000
+> 8 0 9 6 12.340000
+> 8 0 9 7 56.780000
+> 8 0 10 7 1.200000
+> 8 0 10 6 3.400000
+> 8 0 9 6 12.340000
+> 8 0 9 7 56.780000
+> 8 0 10 7 1.200000
+> 8 0 10 6 3.400000
+> 8 0 9 6 12.340000
+> 8 0 9 7 56.780000
+> 8 0 10 7 1.200000
+> 8 0 10 6 3.400000
+> 8 0 9 6 12.340000
+> 8 0 9 7 56.780000
+> 8 0 10 7 1.200000
+> 8 0 10 6 3.400000
+> 9 0.013107 10 7 5.600000
+> 9 0.013107 10 6 7.800000
+> 9 0.013107 10 7 5.600000
+> 9 0.013107 10 6 7.800000
+> 9 0.020388 10 7 5.600000
+> 9 0.020388 10 6 7.800000
+> 9 0.020388 10 7 5.600000
+> 9 0.020388 10 6 7.800000
+> 9 0.020622 10 7 5.600000
+> 9 0.020622 10 6 7.800000
+> 9 0.020622 10 7 5.600000
+> 9 0.020622 10 6 7.800000
+> 9 0.026214 10 7 5.600000
+> 9 0.026214 10 6 7.800000
+> 9 0.026214 10 7 5.600000
+> 9 0.026214 10 6 7.800000
+> 9 0.039321 10 7 5.600000
+> 9 0.039321 10 6 7.800000
+> 9 0.039321 10 7 5.600000
+> 9 0.039321 10 6 7.800000
+> 9 0.040777 10 7 5.600000
+> 9 0.040777 10 6 7.800000
+> 9 0.040777 10 7 5.600000
+> 9 0.040777 10 6 7.800000
+> 9 0.041244 10 7 5.600000
+> 9 0.041244 10 6 7.800000
+> 9 0.041244 10 7 5.600000
+> 9 0.041244 10 6 7.800000
+> 9 0.052427 10 7 5.600000
+> 9 0.052427 10 6 7.800000
+> 9 0.052427 10 7 5.600000
+> 9 0.052427 10 6 7.800000
+> 9 0.061165 10 7 5.600000
+> 9 0.061165 10 6 7.800000
+> 9 0.061165 10 7 5.600000
+> 9 0.061165 10 6 7.800000
+> 9 0.061866 10 7 5.600000
+> 9 0.061866 10 6 7.800000
+> 9 0.061866 10 7 5.600000
+> 9 0.061866 10 6 7.800000
+> 9 0.065534 10 7 5.600000
+> 9 0.065534 10 6 7.800000
+> 9 0.065534 10 7 5.600000
+> 9 0.065534 10 6 7.800000
+> 9 0.078641 10 7 5.600000
+> 9 0.078641 10 6 7.800000
+> 9 0.078641 10 7 5.600000
+> 9 0.078641 10 6 7.800000
+> 9 0.081554 10 7 5.600000
+> 9 0.081554 10 6 7.800000
+> 9 0.081554 10 7 5.600000
+> 9 0.081554 10 6 7.800000
+> 9 0.082488 10 7 5.600000
+> 9 0.082488 10 6 7.800000
+> 9 0.082488 10 7 5.600000
+> 9 0.082488 10 6 7.800000
+> 9 0.091748 10 7 5.600000
+> 9 0.091748 10 6 7.800000
+> 9 0.091748 10 7 5.600000
+> 9 0.091748 10 6 7.800000
+> 9 0.101942 10 7 5.600000
+> 9 0.101942 10 6 7.800000
+> 9 0.101942 10 7 5.600000
+> 9 0.101942 10 6 7.800000
+> 9 0.103110 10 7 5.600000
+> 9 0.103110 10 6 7.800000
+> 9 0.103110 10 7 5.600000
+> 9 0.103110 10 6 7.800000
+> 9 0.104855 10 7 5.600000
+> 9 0.104855 10 6 7.800000
+> 9 0.104855 10 7 5.600000
+> 9 0.104855 10 6 7.800000
+> 9 0.117962 10 7 5.600000
+> 9 0.117962 10 6 7.800000
+> 9 0.117962 10 7 5.600000
+> 9 0.117962 10 6 7.800000
+> 9 0.122330 10 7 5.600000
+> 9 0.122330 10 6 7.800000
+> 9 0.122330 10 7 5.600000
+> 9 0.122330 10 6 7.800000
+> 9 0.123732 10 7 5.600000
+> 9 0.123732 10 6 7.800000
+> 9 0.123732 10 7 5.600000
+> 9 0.123732 10 6 7.800000
+> 9 0.131068 10 7 5.600000
+> 9 0.131068 10 6 7.800000
+> 9 0.131068 10 7 5.600000
+> 9 0.131068 10 6 7.800000
+> 9 0.142719 10 7 5.600000
+> 9 0.142719 10 6 7.800000
+> 9 0.142719 10 7 5.600000
+> 9 0.142719 10 6 7.800000
+> 10 0.144175 10 7 3.400000
+> 10 0.144175 10 6 5.600000
+> 10 0.144175 10 7 3.400000
+> 10 0.144175 10 6 5.600000
+> 9 0.144354 10 7 5.600000
+> 9 0.144354 10 6 7.800000
+> 9 0.144354 10 7 5.600000
+> 9 0.144354 10 6 7.800000
+> 10 0.157282 10 7 3.400000
+> 10 0.157282 10 6 5.600000
+> 10 0.157282 10 7 3.400000
+> 10 0.157282 10 6 5.600000
+> 9 0.163107 10 7 5.600000
+> 9 0.163107 10 6 7.800000
+> 9 0.163107 10 7 5.600000
+> 9 0.163107 10 6 7.800000
+> 9 0.164976 10 7 5.600000
+> 9 0.164976 10 6 7.800000
+> 9 0.164976 10 7 5.600000
+> 9 0.164976 10 6 7.800000
+> 10 0.170389 10 7 3.400000
+> 10 0.170389 10 6 5.600000
+> 10 0.170389 10 7 3.400000
+> 10 0.170389 10 6 5.600000
+> 9 0.183496 10 7 5.600000
+> 9 0.183496 10 6 7.800000
+> 9 0.183496 10 7 5.600000
+> 9 0.183496 10 6 7.800000
+> 10 0.183496 10 7 3.400000
+> 10 0.183496 10 6 5.600000
+> 10 0.183496 10 7 3.400000
+> 10 0.183496 10 6 5.600000
+> 9 0.185598 10 7 5.600000
+> 9 0.185598 10 6 7.800000
+> 9 0.185598 10 7 5.600000
+> 9 0.185598 10 6 7.800000
+> 10 0.196602 10 7 3.400000
+> 10 0.196602 10 6 5.600000
+> 10 0.196602 10 7 3.400000
+> 10 0.196602 10 6 5.600000
+> 9 0.203884 10 7 5.600000
+> 9 0.203884 10 6 7.800000
+> 9 0.203884 10 7 5.600000
+> 9 0.203884 10 6 7.800000
+> 9 0.206220 10 7 5.600000
+> 9 0.206220 10 6 7.800000
+> 9 0.206220 10 7 5.600000
+> 9 0.206220 10 6 7.800000
+> 10 0.209709 10 7 3.400000
+> 10 0.209709 10 6 5.600000
+> 10 0.209709 10 7 3.400000
+> 10 0.209709 10 6 5.600000
+> 10 0.222816 10 7 3.400000
+> 10 0.222816 10 6 5.600000
+> 10 0.222816 10 7 3.400000
+> 10 0.222816 10 6 5.600000
+> 10 0.224272 10 7 3.400000
+> 10 0.224272 10 6 5.600000
+> 10 0.224272 10 7 3.400000
+> 10 0.224272 10 6 5.600000
+> 10 0.226842 10 7 3.400000
+> 10 0.226842 10 6 5.600000
+> 10 0.226842 10 7 3.400000
+> 10 0.226842 10 6 5.600000
+> 10 0.235923 10 7 3.400000
+> 10 0.235923 10 6 5.600000
+> 10 0.235923 10 7 3.400000
+> 10 0.235923 10 6 5.600000
+> 10 0.244661 10 7 3.400000
+> 10 0.244661 10 6 5.600000
+> 10 0.244661 10 7 3.400000
+> 10 0.244661 10 6 5.600000
+> 10 0.247463 10 7 3.400000
+> 10 0.247463 10 6 5.600000
+> 10 0.247463 10 7 3.400000
+> 10 0.247463 10 6 5.600000
+> 10 0.249030 10 7 3.400000
+> 10 0.249030 10 6 5.600000
+> 10 0.249030 10 7 3.400000
+> 10 0.249030 10 6 5.600000
+> 10 0.262137 10 7 3.400000
+> 10 0.262137 10 6 5.600000
+> 10 0.262137 10 7 3.400000
+> 10 0.262137 10 6 5.600000
+> 10 0.265049 10 7 3.400000
+> 10 0.265049 10 6 5.600000
+> 10 0.265049 10 7 3.400000
+> 10 0.265049 10 6 5.600000
+> 10 0.268085 10 7 3.400000
+> 10 0.268085 10 6 5.600000
+> 10 0.268085 10 7 3.400000
+> 10 0.268085 10 6 5.600000
+> 10 0.285438 10 7 3.400000
+> 10 0.285438 10 6 5.600000
+> 10 0.285438 10 7 3.400000
+> 10 0.285438 10 6 5.600000
+> 10 0.288707 10 7 3.400000
+> 10 0.288707 10 6 5.600000
+> 10 0.288707 10 7 3.400000
+> 10 0.288707 10 6 5.600000
+> 10 0.305826 10 7 3.400000
+> 10 0.305826 10 6 5.600000
+> 10 0.305826 10 7 3.400000
+> 10 0.305826 10 6 5.600000
+> 10 0.309329 10 7 3.400000
+> 10 0.309329 10 6 5.600000
+> 10 0.309329 10 7 3.400000
+> 10 0.309329 10 6 5.600000
+> 10 0.326214 10 7 3.400000
+> 10 0.326214 10 6 5.600000
+> 10 0.326214 10 7 3.400000
+> 10 0.326214 10 6 5.600000
+> 10 0.329951 10 7 3.400000
+> 10 0.329951 10 6 5.600000
+> 10 0.329951 10 7 3.400000
+> 10 0.329951 10 6 5.600000
+> 10 0.346603 10 7 3.400000
+> 10 0.346603 10 6 5.600000
+> 10 0.346603 10 7 3.400000
+> 10 0.346603 10 6 5.600000
+> 10 0.350573 10 7 3.400000
+> 10 0.350573 10 6 5.600000
+> 10 0.350573 10 7 3.400000
+> 10 0.350573 10 6 5.600000
+> 10 0.366991 10 7 3.400000
+> 10 0.366991 10 6 5.600000
+> 10 0.366991 10 7 3.400000
+> 10 0.366991 10 6 5.600000
+> 10 0.371195 10 7 3.400000
+> 10 0.371195 10 6 5.600000
+> 10 0.371195 10 7 3.400000
+> 10 0.371195 10 6 5.600000
+> 10 0.387380 10 7 3.400000
+> 10 0.387380 10 6 5.600000
+> 10 0.387380 10 7 3.400000
+> 10 0.387380 10 6 5.600000
+> 10 0.391817 10 7 3.400000
+> 10 0.391817 10 6 5.600000
+> 10 0.391817 10 7 3.400000
+> 10 0.391817 10 6 5.600000
+> 10 0.407768 10 7 3.400000
+> 10 0.407768 10 6 5.600000
+> 10 0.407768 10 7 3.400000
+> 10 0.407768 10 6 5.600000
+> 10 0.412439 10 7 3.400000
+> 10 0.412439 10 6 5.600000
+> 10 0.412439 10 7 3.400000
+> 10 0.412439 10 6 5.600000
+> 7 0.412439 1 3
+> 7 0.412439 1 1
+> 7 0.412439 3 16
+> 7 0.412439 3 14
+> 7 0.412439 3 12
+> 7 0.412439 3 10
+> 7 0.412439 3 7
+> 7 0.412439 3 13
+> 7 0.412439 3 15
+> 7 0.412439 3 6
+> 7 0.412439 3 8
+> 7 0.412439 3 11
+> 7 0.412439 3 9
+> 7 0.412439 1 5
+> 7 0.412439 1 2
+> 7 0.412439 1 4
+
+$ rm -f simgrid.trace

diff --git a/examples/msg/tracing/CMakeLists.txt b/examples/msg/tracing/CMakeLists.txt
index 1d9ae23..405c0a9 100644 (file)
--- a/examples/msg/tracing/CMakeLists.txt
+++ b/examples/msg/tracing/CMakeLists.txt
@@ -1,4 +1,4 @@
-foreach (example ms procmig link_user_variables)
+foreach (example ms procmig)
   add_executable       (${example} ${example}.c)
   target_link_libraries(${example} simgrid)
   set(examples_src  ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${example}.c)

diff --git a/examples/msg/tracing/link_user_variables.tesh b/examples/msg/tracing/link_user_variables.tesh
deleted file mode 100644 (file)
index 9dd5934..0000000
--- a/examples/msg/tracing/link_user_variables.tesh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! ./tesh
-
-p Tracing master/slave application
-$ $SG_TEST_EXENV ${bindir:=.}/tracing/link_user_variables$EXEEXT --cfg=tracing:yes --cfg=tracing/platform:yes ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/tracing/deployment.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing' to 'yes'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'tracing/platform' to 'yes'