Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
some cleanups in examples/msg
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Tue, 22 Mar 2016 20:51:12 +0000 (21:51 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Tue, 22 Mar 2016 21:35:05 +0000 (22:35 +0100)
45 files changed:
.gitignore
examples/msg/CMakeLists.txt
examples/msg/energy/CMakeLists.txt
examples/msg/energy/consumption/consumption.c
examples/msg/energy/consumption/consumption.tesh
examples/msg/energy/consumption/deployment_consumption.xml [deleted file]
examples/msg/energy/onoff/deployment_onoff.xml [deleted file]
examples/msg/energy/onoff/onoff.c
examples/msg/energy/onoff/onoff.tesh
examples/msg/energy/pstate/deployment_pstate.xml [deleted file]
examples/msg/energy/pstate/pstate.c
examples/msg/energy/pstate/pstate.tesh
examples/msg/energy/vm/vm.c
examples/msg/exception/CMakeLists.txt [deleted file]
examples/msg/exception/deployment_exception.xml [deleted file]
examples/msg/exception/exception.c
examples/msg/exception/exception.tesh
examples/msg/migration/CMakeLists.txt [deleted file]
examples/msg/migration/migration.c
examples/msg/migration/migration.deploy [deleted file]
examples/msg/migration/migration.tesh
examples/msg/parallel_task/CMakeLists.txt [deleted file]
examples/msg/pmm/CMakeLists.txt [deleted file]
examples/msg/pmm/pmm.c [moved from examples/msg/pmm/msg_pmm.c with 100% similarity]
examples/msg/pmm/pmm.tesh
examples/msg/priority/CMakeLists.txt [deleted file]
examples/msg/priority/priority.tesh
examples/msg/priority/priority_d.xml [moved from examples/msg/priority/deployment_priority.xml with 100% similarity]
examples/msg/properties/CMakeLists.txt [deleted file]
examples/msg/properties/properties.c [moved from examples/msg/properties/msg_prop.c with 100% similarity]
examples/msg/properties/properties.tesh [moved from examples/msg/properties/msg_prop.tesh with 94% similarity]
examples/msg/properties/properties_d.xml [moved from examples/msg/properties/deployment_properties.xml with 100% similarity]
examples/msg/semaphores/CMakeLists.txt [deleted file]
examples/msg/start_kill_time/CMakeLists.txt
examples/msg/start_kill_time/start_kill_time.c [moved from examples/msg/start_kill_time/sk_time.c with 100% similarity]
examples/msg/start_kill_time/start_kill_time.tesh
examples/msg/suspend/CMakeLists.txt [deleted file]
examples/msg/suspend/suspend.tesh
examples/msg/synchro/synchro.c [moved from examples/msg/semaphores/synchro.c with 100% similarity]
examples/msg/synchro/synchro.tesh [moved from examples/msg/semaphores/synchro.tesh with 92% similarity]
examples/msg/token_ring/CMakeLists.txt [deleted file]
examples/msg/token_ring/token_ring.c [moved from examples/msg/token_ring/ring_call.c with 100% similarity]
examples/msg/token_ring/token_ring.tesh
examples/simdag/CMakeLists.txt
tools/cmake/DefinePackages.cmake

index 47e4494..0bd61c5 100644 (file)
@@ -180,18 +180,16 @@ examples/msg/ns3/ns3
 examples/msg/parallel_contexts/pcontexts
 examples/msg/parallel_contexts/pcontexts2
 examples/msg/parallel_task/parallel_task
-examples/msg/parallel_task/test_ptask
 examples/msg/pastry/pastry
-examples/msg/pmm/msg_pmm
+examples/msg/pmm/pmm
 examples/msg/priority/priority
 examples/msg/procmig.trace
-examples/msg/properties/msg_prop
-examples/msg/semaphores/synchro
+examples/msg/properties/properties
+examples/msg/synchro/synchro
 examples/msg/sendrecv/sendrecv
-examples/msg/sendrecv/sendrecv_main
 examples/msg/set-maestro/set-maestro
 examples/msg/simulation.trace
-examples/msg/start_kill_time/sk_time
+examples/msg/start_kill_time/start_kill_time
 examples/msg/suspend/suspend
 examples/msg/tasks.trace
 examples/msg/token_ring/token_ring
index bb74af3..dd4296e 100644 (file)
@@ -1,5 +1,27 @@
+foreach(x exception migration parallel_task pmm priority properties suspend synchro token_ring)
+  add_executable       (${x}     ${x}/${x}.c)
+  target_link_libraries(${x}     simgrid)
+  set_target_properties(${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
+  set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c)
+  set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
+endforeach()
+
 foreach(file bourassa fafard ginette jupiter link3 link4 link5)
   set(txt_files ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/${file}_state.trace)
 endforeach()
 
-set(txt_files   ${txt_files} ${CMAKE_CURRENT_SOURCE_DIR}/README  PARENT_SCOPE)
+set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/README                       PARENT_SCOPE)
+set(examples_src ${examples_src}                                                           PARENT_SCOPE)
+set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/parallel_task/parallel_task_energy.tesh      PARENT_SCOPE)
+set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/priority/priority_d.xml
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/properties/properties_d.xml                  PARENT_SCOPE)
+
+foreach(x migration priority properties suspend synchro token_ring)
+  ADD_TESH_FACTORIES(msg-${x} "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/platforms --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/${x} ${x}.tesh)
+endforeach()
+
+ADD_TESH_FACTORIES(msg-ptask        "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
+ADD_TESH_FACTORIES(msg-ptask-energy "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task_energy.tesh)
+ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
+# This one is not usable:
+# ADD_TESH_FACTORIES(msg-exception "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/exception/exception.tesh)
index 72737e7..fb8f9df 100644 (file)
@@ -13,7 +13,4 @@ ADD_TESH_FACTORIES(msg-ptask-energy-consumption "thread;ucontext;raw;boost" --cf
 
 set(examples_src  ${examples_src}                                                                        PARENT_SCOPE)
 set(tesh_files    ${tesh_files}                                                                          PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/onoff/platform_onoff.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/consumption/deployment_consumption.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/onoff/deployment_onoff.xml
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/pstate/deployment_pstate.xml              PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/onoff/platform_onoff.xml                  PARENT_SCOPE)
index 5e1bd00..c8fa346 100644 (file)
@@ -4,7 +4,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-
 #include "simgrid/msg.h"
 #include "simgrid/plugins/energy.h"
 
@@ -73,13 +72,10 @@ int main(int argc, char *argv[])
   sg_energy_plugin_init();
   MSG_init(&argc, argv);
 
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-            "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+  xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
-  MSG_function_register("dvfs_test", dvfs);
-
-  MSG_launch_application(argv[2]);
+  MSG_process_create("dvfs_test", dvfs, NULL, MSG_get_host_by_name("MyHost1"));
 
   res = MSG_main();
 
index 9bcc114..4fca5e9 100644 (file)
@@ -2,7 +2,7 @@
 
 p Testing the mechanism for computing host energy consumption
 
-$ $SG_TEST_EXENV energy/consumption/consumption$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml ${srcdir:=.}/energy/consumption/deployment_consumption.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV energy/consumption/consumption$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:dvfs_test@MyHost1) Energetic profile: 100.0:200.0, 93.0:170.0, 90.0:150.0
 > [  0.000000] (1:dvfs_test@MyHost1) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
 > [  0.000000] (1:dvfs_test@MyHost1) Sleep for 10 seconds
diff --git a/examples/msg/energy/consumption/deployment_consumption.xml b/examples/msg/energy/consumption/deployment_consumption.xml
deleted file mode 100644 (file)
index 52ebe54..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="MyHost1" function="dvfs_test" />
-</platform>
diff --git a/examples/msg/energy/onoff/deployment_onoff.xml b/examples/msg/energy/onoff/deployment_onoff.xml
deleted file mode 100644 (file)
index 9b90483..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="MyHost2" function="onoff_test" />
-</platform>
index 78ced0e..5462489 100644 (file)
@@ -4,7 +4,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-
 #include "simgrid/msg.h"
 #include "simgrid/plugins/energy.h"
 
@@ -89,13 +88,11 @@ int main(int argc, char *argv[])
   sg_energy_plugin_init();
   MSG_init(&argc, argv);
 
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-       "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+  xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
 
-  MSG_function_register("onoff_test", onoff);
-  MSG_launch_application(argv[2]);
+  MSG_process_create("onoff_test", onoff, NULL, MSG_get_host_by_name("MyHost2"));
 
   res = MSG_main();
 
index a796429..34276aa 100644 (file)
@@ -3,7 +3,7 @@
 p Testing the mechanism for computing host energy consumption
 
 ! output sort 19
-$ $SG_TEST_EXENV energy/onoff/onoff$EXEEXT ${srcdir:=.}/energy/onoff/platform_onoff.xml ${srcdir:=.}/energy/onoff/deployment_onoff.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV energy/onoff/onoff$EXEEXT ${srcdir:=.}/energy/onoff/platform_onoff.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:onoff_test@MyHost2) Energetic profile: 95.0:200.0,93.0:170.0,90.0:150.0,       120:120,110:110
 > [  0.000000] (1:onoff_test@MyHost2) Initial peak speed=1E+08 flop/s; Energy dissipated =0E+00 J
 > [  0.000000] (1:onoff_test@MyHost2) Sleep for 10 seconds
diff --git a/examples/msg/energy/pstate/deployment_pstate.xml b/examples/msg/energy/pstate/deployment_pstate.xml
deleted file mode 100644 (file)
index a128713..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="MyHost1" function="dvfs_test" />
-  <process host="MyHost2" function="dvfs_test" />
-</platform>
index 817e1ea..ff9e2e7 100644 (file)
@@ -73,13 +73,12 @@ int main(int argc, char *argv[])
 
   MSG_init(&argc, argv);
 
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-            "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+  xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
 
-  MSG_function_register("dvfs_test", dvfs);
-  MSG_launch_application(argv[2]);
+  MSG_process_create("dvfs_test", dvfs, NULL, MSG_get_host_by_name("MyHost1"));
+  MSG_process_create("dvfs_test", dvfs, NULL, MSG_get_host_by_name("MyHost2"));
 
   res = MSG_main();
 
index 33c44d1..f8b733a 100644 (file)
@@ -2,7 +2,7 @@
 
 p Testing the DVFS-related functions
 
-$ $SG_TEST_EXENV energy/pstate/pstate$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml ${srcdir:=.}/energy/pstate/deployment_pstate.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV energy/pstate/pstate$EXEEXT ${srcdir:=.}/../platforms/energy_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:dvfs_test@MyHost1) Count of Processor states=3
 > [  0.000000] (2:dvfs_test@MyHost2) Count of Processor states=3
 > [  0.000000] (1:dvfs_test@MyHost1) Current power peak=100000000.000000
index 34383f1..8201ecb 100644 (file)
@@ -4,7 +4,6 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-
 #include "simgrid/msg.h"
 #include "simgrid/plugins/energy.h"
 
@@ -75,4 +74,3 @@ int main(int argc, char *argv[])
 
   return res != MSG_OK;
 }
-
diff --git a/examples/msg/exception/CMakeLists.txt b/examples/msg/exception/CMakeLists.txt
deleted file mode 100644 (file)
index f456344..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-add_executable       (exception exception.c)
-target_link_libraries(exception simgrid)
-
-# This one is not usable:
-# ADD_TESH_FACTORIES(msg-exception "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/exception/exception.tesh)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/exception.tesh            PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/exception.c               PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deployment_exception.xml  PARENT_SCOPE)
diff --git a/examples/msg/exception/deployment_exception.xml b/examples/msg/exception/deployment_exception.xml
deleted file mode 100644 (file)
index 2b5a705..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Jacquelin" function="terrorist"/>
-</platform>
index 77e3406..56b06f7 100644 (file)
@@ -108,11 +108,10 @@ int main(int argc, char *argv[]) {
   msg_error_t res = MSG_OK;
 
   MSG_init(&argc, argv);
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-             "\tExample: %s msg_platform.xml msg_deployment.xml\n", argv[0], argv[0]);
+  xbt_assert(argc > 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
-  MSG_function_register("terrorist", terrorist);
   MSG_create_environment(argv[1]);
+  MSG_process_create("terrorist", terrorist, NULL, MSG_get_host_by_name("Jacquelin"));
   MSG_launch_application(argv[2]);
 
   // Launch the simulation
index ca5307a..db3b7a7 100644 (file)
@@ -3,7 +3,7 @@
 p Testing the remote exception raising feature
 
 ! output sort 19
-$ $SG_TEST_EXENV exception/exception ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/exception/deployment_exception.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" "--cfg=exception/cutpath:1"
+$ $SG_TEST_EXENV exception/exception ${srcdir:=.}/../platforms/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" "--cfg=exception/cutpath:1"
 > [  0.000000] (1:terrorist@Jacquelin) Let's create a victim.
 > [  0.000000] (2:victim@Jacquelin) Let's work.
 > [  0.000000] (1:terrorist@Jacquelin) Going to sleep for 1 second
diff --git a/examples/msg/migration/CMakeLists.txt b/examples/msg/migration/CMakeLists.txt
deleted file mode 100644 (file)
index a4902ba..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-add_executable       (migration migration.c)
-target_link_libraries(migration simgrid)
-
-ADD_TESH_FACTORIES(msg-migration "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.tesh)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/migration.tesh    PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/migration.c       PARENT_SCOPE)
-set(bin_files     ${bin_files}     ${CMAKE_CURRENT_SOURCE_DIR}/migration.deploy  PARENT_SCOPE)
index 804affb..7898153 100644 (file)
@@ -65,14 +65,12 @@ int main(int argc, char *argv[])
   msg_error_t res = MSG_OK;
 
   MSG_init(&argc, argv);
-  xbt_assert(argc > 2, "Usage: %s platform_file deployment_file\n"
-            "\tExample: %s msg_platform.xml msg_deployment_suspend.xml\n", argv[0], argv[0]);
+  xbt_assert(argc == 2, "Usage: %s platform_file\n\tExample: %s msg_platform.xml\n", argv[0], argv[0]);
 
   MSG_create_environment(argv[1]);
 
-  MSG_function_register("emigrant", emigrant);
-  MSG_function_register("policeman", policeman);
-  MSG_launch_application(argv[2]);
+  MSG_process_create("emigrant", emigrant, NULL, MSG_get_host_by_name("Jacquelin"));
+  MSG_process_create("policeman", policeman, NULL, MSG_get_host_by_name("Boivin"));
 
   mutex = xbt_mutex_init();
   cond = xbt_cond_init();
diff --git a/examples/msg/migration/migration.deploy b/examples/msg/migration/migration.deploy
deleted file mode 100644 (file)
index 3ccb8d1..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE platform SYSTEM "http://simgrid.gforge.inria.fr/simgrid/simgrid.dtd">
-<platform version="4">
-  <process host="Jacquelin" function="emigrant"/>
-  <process host="Boivin" function="policeman"/>
-</platform>
index 01630be..ec8c900 100644 (file)
@@ -3,7 +3,7 @@
 p Testing the migration feature of MSG
 
 ! output sort 19
-$ $SG_TEST_EXENV migration/migration ${srcdir:=.}/../platforms/platform.xml ${srcdir:=.}/migration/migration.deploy  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/migration ${srcdir:=.}/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:emigrant@Jacquelin) I'll look for a new job on another machine where the grass is greener.
 > [  0.000000] (1:emigrant@Boivin) Yeah, found something to do
 > [  0.000000] (2:policeman@Boivin) Wait a bit before migrating the emigrant.
diff --git a/examples/msg/parallel_task/CMakeLists.txt b/examples/msg/parallel_task/CMakeLists.txt
deleted file mode 100644 (file)
index 6dcf9b5..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-add_executable       (parallel_task parallel_task.c)
-target_link_libraries(parallel_task simgrid)
-
-ADD_TESH_FACTORIES(msg-ptask "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task.tesh)
-
-ADD_TESH_FACTORIES(msg-ptask-energy "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/parallel_task/parallel_task_energy.tesh)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/parallel_task.tesh  
-                                   ${CMAKE_CURRENT_SOURCE_DIR}/parallel_task_energy.tesh  PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/parallel_task.c            PARENT_SCOPE)
diff --git a/examples/msg/pmm/CMakeLists.txt b/examples/msg/pmm/CMakeLists.txt
deleted file mode 100644 (file)
index bc2c180..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (msg_pmm msg_pmm.c)
-target_link_libraries(msg_pmm simgrid)
-
-ADD_TESH(msg-pmm  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm.tesh)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/pmm.tesh   PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/msg_pmm.c  PARENT_SCOPE)
index bb6abf7..a7798be 100644 (file)
@@ -3,7 +3,7 @@
 p Testing the Parallel Matrix Multiplication 
 
 ! timeout 120
-$ ./pmm/msg_pmm --log=msg_pmm.thres:verbose --log=no_loc ${srcdir:=.}/../platforms/cluster.xml
+$ ./pmm/pmm --log=msg_pmm.thres:verbose --log=no_loc ${srcdir:=.}/../platforms/cluster.xml
 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 0
 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 1
 > [node-0.acme.org:node:(1) 0.000000] [msg_pmm/VERBOSE] Create job 2
diff --git a/examples/msg/priority/CMakeLists.txt b/examples/msg/priority/CMakeLists.txt
deleted file mode 100644 (file)
index ff2061b..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-add_executable       (priority priority.c)
-target_link_libraries(priority simgrid)
-
-ADD_TESH_FACTORIES(msg-priority "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/priority/priority.tesh)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/priority.tesh            PARENT_SCOPE)
-set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deployment_priority.xml  PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/priority.c               PARENT_SCOPE)
index 2edd508..34f1712 100644 (file)
@@ -3,7 +3,7 @@
 p Testing a simple master/slave example application
 
 ! output sort 19
-$ $SG_TEST_EXENV priority/priority$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml  ${srcdir:=.}/priority/deployment_priority.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/priority$EXEEXT ${srcdir:=.}/small_platform.xml  ${srcdir:=.}/../msg/priority/priority_d.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:test@Fafard) Hello! Running a task of size 7.6296e+07 with priority 1
 > [  0.000000] (2:test@Fafard) Hello! Running a task of size 7.6296e+07 with priority 2
 > [  1.500000] (2:test@Fafard) Goodbye now!
diff --git a/examples/msg/properties/CMakeLists.txt b/examples/msg/properties/CMakeLists.txt
deleted file mode 100644 (file)
index eb0f535..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-add_executable       (msg_prop msg_prop.c)
-target_link_libraries(msg_prop simgrid)
-
-ADD_TESH_FACTORIES(msg-properties "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/properties/msg_prop.tesh)
-
-set(tesh_files     ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/msg_prop.tesh              PARENT_SCOPE)
-set(xml_files      ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deployment_properties.xml  PARENT_SCOPE)
-set(examples_src   ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/msg_prop.c                 PARENT_SCOPE)
similarity index 94%
rename from examples/msg/properties/msg_prop.tesh
rename to examples/msg/properties/properties.tesh
index e35366d..b984c34 100644 (file)
@@ -3,7 +3,7 @@
 p Testing a MSG application with properties in the XML for Hosts, Links and Processes
 
 ! output sort 19
-$ $SG_TEST_EXENV properties/msg_prop$EXEEXT ${srcdir:=.}/../platforms/prop.xml ${srcdir:=.}/properties/deployment_properties.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/properties$EXEEXT ${srcdir:=.}/prop.xml ${srcdir:=.}/../msg/properties/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 'node-3.acme.org' runs at 1000000000 flops/s
 > [  0.000000] (0:maestro@) Host 'node-0.acme.org' runs at 1000000000 flops/s
diff --git a/examples/msg/semaphores/CMakeLists.txt b/examples/msg/semaphores/CMakeLists.txt
deleted file mode 100644 (file)
index b6be9bb..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (synchro synchro.c)
-target_link_libraries(synchro simgrid)
-
-ADD_TESH_FACTORIES(msg-semaphores  "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/semaphores/synchro.tesh)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/synchro.tesh  PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/synchro.c     PARENT_SCOPE)
index c95dc49..7235dc9 100644 (file)
@@ -1,10 +1,10 @@
-add_executable       (sk_time sk_time.c)
-target_link_libraries(sk_time simgrid)
+add_executable       (start_kill_time start_kill_time.c)
+target_link_libraries(start_kill_time simgrid)
 
 ADD_TESH(msg-start-kill-time --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/msg/start_kill_time/start_kill_time.tesh)
 
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/sk_time.c             PARENT_SCOPE)
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time.tesh  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time.c             PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/start_kill_time.tesh   PARENT_SCOPE)
 set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/deployment_kill.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/deployment_start_kill.xml
                                    ${CMAKE_CURRENT_SOURCE_DIR}/deployment_start.xml
index f38d83a..c6c59c7 100644 (file)
@@ -2,7 +2,7 @@
 
 p Test0 Process without time
 
-$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
 > [ 10.000000] (1:sleeper@node-0.acme.org) Done sleeping.
 > [ 10.000000] (1:sleeper@node-0.acme.org) Exiting now (done sleeping or got killed).
@@ -10,7 +10,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/plat
 
 p Test1 Process with start time
 
-$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_start.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_start.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
 > [  1.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep.
 > [  2.000000] (3:sleeper@node-2.acme.org) Hello! I go to sleep.
@@ -33,7 +33,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/plat
 
 p Test1 Process with kill time
 
-$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-1.acme.org) Hello! I go to sleep.
 > [  0.000000] (2:sleeper@node-2.acme.org) Hello! I go to sleep.
 > [  0.000000] (3:sleeper@node-3.acme.org) Hello! I go to sleep.
@@ -45,7 +45,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/plat
 
 p Test2 Process with start and kill times
 
-$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/sk_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_start_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/start_kill_time/start_kill_time ${srcdir:=.}/examples/platforms/cluster.xml ${srcdir:=.}/examples/msg/start_kill_time/deployment_start_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sleeper@node-0.acme.org) Hello! I go to sleep.
 > [  1.000000] (2:sleeper@node-1.acme.org) Hello! I go to sleep.
 > [  2.000000] (3:sleeper@node-2.acme.org) Hello! I go to sleep.
diff --git a/examples/msg/suspend/CMakeLists.txt b/examples/msg/suspend/CMakeLists.txt
deleted file mode 100644 (file)
index 1a7076f..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (suspend suspend.c)
-target_link_libraries(suspend simgrid)
-
-ADD_TESH_FACTORIES(msg-suspend "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/suspend.tesh)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/suspend.tesh  PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/suspend.c     PARENT_SCOPE)
index 72b8178..341ec90 100644 (file)
@@ -3,7 +3,7 @@
 p Testing the suspend/resume feature of MSG
 
 ! output sort 19
-$ $SG_TEST_EXENV suspend/suspend ${srcdir:=.}/../platforms/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/suspend ${srcdir:=.}/platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:dream_master@Jacquelin) Let's create a lazy guy.
 > [  0.000000] (1:dream_master@Jacquelin) Let's wait a little bit...
 > [  0.000000] (2:Lazy@Jacquelin) Nobody's watching me ? Let's go to sleep.
similarity index 92%
rename from examples/msg/semaphores/synchro.tesh
rename to examples/msg/synchro/synchro.tesh
index e157522..cf187fe 100644 (file)
@@ -3,7 +3,7 @@
 p Testing synchronization with semaphores
 
 ! output sort 19
-$ $SG_TEST_EXENV semaphores/synchro ${srcdir:=.}/../platforms/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/synchro ${srcdir:=.}/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:Alice@Fafard) Trying to acquire 1
 > [  0.000000] (1:Alice@Fafard) Acquired 1
 > [  0.900000] (2:Bob@Fafard) Trying to acquire 1
diff --git a/examples/msg/token_ring/CMakeLists.txt b/examples/msg/token_ring/CMakeLists.txt
deleted file mode 100644 (file)
index 89e8376..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (token_ring ring_call.c)
-target_link_libraries(token_ring simgrid)
-
-ADD_TESH_FACTORIES(msg-token-ring "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY} --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/token_ring.tesh)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/token_ring.tesh  PARENT_SCOPE)
-set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/ring_call.c      PARENT_SCOPE)
index 32d3381..09fe3ed 100644 (file)
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/examples/platforms/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Number of host '6'
 > [  0.000000] (1:0@host1) Host "0" send 'Token' to Host "1"
 > [  0.017354] (2:1@host2) Host "1" received "Token"
@@ -16,7 +16,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/examples/platforms/routing
 > [  0.131796] (1:0@host1) Host "0" received "Token"
 > [  0.131796] (0:maestro@) Simulation time 0.131796
 
-$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/examples/platforms/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n"
 > [    0.000000] (0:maestro@) Configuration change: Set 'network/coordinates' to 'yes'
 > [    0.000000] (0:maestro@) Number of host '2'
 > [    0.000000] (1:0@peer_100030591) Host "0" send 'Token' to Host "1"
@@ -25,7 +25,7 @@ $ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/examples/platforms/two_pee
 > [    1.275820] (1:0@peer_100030591) Host "0" received "Token"
 > [    1.275820] (0:maestro@) Simulation time 1.27582
 
-$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/examples/platforms/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ $SG_TEST_EXENV ${bindir:=.}/token_ring ${srcdir:=.}/meta_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:maestro@) Number of host '60'
 > [  0.000000] (1:0@host-2.cluster1) Host "0" send 'Token' to Host "1"
 > [  0.030364] (2:1@host-2.cluster2) Host "1" received "Token"
index efb62ab..0c5e10e 100644 (file)
@@ -4,11 +4,13 @@ foreach(x availability fail typed_tasks io properties comm_throttling scheduling
   set_target_properties(sd_${x}  PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${x})
   set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/sd_${x}.c)
   set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/${x}/sd_${x}.tesh)
-
-  ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/${x}/sd_${x}.tesh)
 endforeach()
 
 set(examples_src ${examples_src}                                                           PARENT_SCOPE)
 set(tesh_files   ${tesh_files}                                                             PARENT_SCOPE)
 set(xml_files    ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/scheduling/Montage_25.xml    PARENT_SCOPE)
 set(bin_files    ${bin_files}     ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua          PARENT_SCOPE)
+
+foreach(x availability fail typed_tasks io properties comm_throttling scheduling test)
+  ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/${x}/sd_${x}.tesh)
+endforeach()
index 2f7ae90..53139cf 100644 (file)
@@ -943,47 +943,35 @@ set(CMAKEFILES_TXT
   examples/java/tracing/CMakeLists.txt
   
   examples/msg/CMakeLists.txt
-  examples/msg/actions/CMakeLists.txt
-  examples/msg/bittorrent/CMakeLists.txt
-  examples/msg/chainsend/CMakeLists.txt
-  examples/msg/chord/CMakeLists.txt
-  examples/msg/cloud/CMakeLists.txt
-  examples/msg/energy/CMakeLists.txt
-  examples/msg/exception/CMakeLists.txt
-  examples/msg/gtnets/CMakeLists.txt 
-  examples/msg/icomms/CMakeLists.txt
-  examples/msg/io/CMakeLists.txt
-  examples/msg/kademlia/CMakeLists.txt
-  examples/msg/masterslave/CMakeLists.txt
-  examples/msg/mc/CMakeLists.txt
-  examples/msg/migration/CMakeLists.txt
-  examples/msg/ns3/CMakeLists.txt
-  examples/msg/parallel_task/CMakeLists.txt
-  examples/msg/pastry/CMakeLists.txt
-  examples/msg/pmm/CMakeLists.txt
-  examples/msg/priority/CMakeLists.txt
-  examples/msg/properties/CMakeLists.txt
-  examples/msg/semaphores/CMakeLists.txt
-  examples/msg/sendrecv/CMakeLists.txt
-  examples/msg/set-maestro/CMakeLists.txt
-  examples/msg/start_kill_time/CMakeLists.txt
-  examples/msg/suspend/CMakeLists.txt
-  examples/msg/token_ring/CMakeLists.txt
-  examples/msg/tracing/CMakeLists.txt
-  
+    examples/msg/actions/CMakeLists.txt
+    examples/msg/bittorrent/CMakeLists.txt
+    examples/msg/chainsend/CMakeLists.txt
+    examples/msg/chord/CMakeLists.txt
+    examples/msg/cloud/CMakeLists.txt
+    examples/msg/energy/CMakeLists.txt
+    examples/msg/gtnets/CMakeLists.txt 
+    examples/msg/icomms/CMakeLists.txt
+    examples/msg/io/CMakeLists.txt
+    examples/msg/kademlia/CMakeLists.txt
+    examples/msg/masterslave/CMakeLists.txt
+    examples/msg/mc/CMakeLists.txt
+    examples/msg/ns3/CMakeLists.txt
+    examples/msg/pastry/CMakeLists.txt
+    examples/msg/sendrecv/CMakeLists.txt
+    examples/msg/set-maestro/CMakeLists.txt
+    examples/msg/start_kill_time/CMakeLists.txt
+    examples/msg/tracing/CMakeLists.txt
   examples/s4u/CMakeLists.txt
-  
   examples/simdag/CMakeLists.txt
-  examples/simdag/dax/CMakeLists.txt
-  examples/simdag/dot/CMakeLists.txt
-  examples/simdag/goal/CMakeLists.txt
-  
+    examples/simdag/dax/CMakeLists.txt
+    examples/simdag/dot/CMakeLists.txt
+    examples/simdag/goal/CMakeLists.txt
   examples/smpi/CMakeLists.txt
-  examples/smpi/NAS/CMakeLists.txt
-  examples/smpi/smpi_msg_masterslave/CMakeLists.txt
-  examples/smpi/replay_multiple/CMakeLists.txt
-  examples/smpi/energy/f77/CMakeLists.txt
-  examples/smpi/energy/f90/CMakeLists.txt
+    examples/smpi/NAS/CMakeLists.txt
+    examples/smpi/smpi_msg_masterslave/CMakeLists.txt
+    examples/smpi/replay_multiple/CMakeLists.txt
+    examples/smpi/energy/f77/CMakeLists.txt
+    examples/smpi/energy/f90/CMakeLists.txt
 
   teshsuite/java/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt