move the set-maestro test to its own directory

The test got fixed in the process even if I don't know how I did that.
I feel suspicious, the test should be further augmented to check that
it actually test the right thing.

diff --git a/examples/msg/sendrecv/CMakeLists.txt b/examples/msg/sendrecv/CMakeLists.txt
index 62f6367..9a0cef4 100644 (file)
--- a/examples/msg/sendrecv/CMakeLists.txt
+++ b/examples/msg/sendrecv/CMakeLists.txt
@@ -1,7 +1,5 @@
 add_executable       (sendrecv      sendrecv.c)
 target_link_libraries(sendrecv      simgrid)
-add_executable       (sendrecv_main sendrecv_main.c)
-target_link_libraries(sendrecv_main simgrid)
 
 set(tesh_files
   ${tesh_files}
@@ -13,15 +11,10 @@ set(tesh_files
 set(xml_files
   ${xml_files}
   ${CMAKE_CURRENT_SOURCE_DIR}/deployment_sendrecv.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/deployment_sendrecv_main.xml
   PARENT_SCOPE)
 set(examples_src
   ${examples_src}
   ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv_main.c
-  PARENT_SCOPE)
-set(bin_files
-  ${bin_files}
   PARENT_SCOPE)
 set(txt_files
   ${txt_files}

diff --git a/examples/msg/set-maestro/CMakeLists.txt b/examples/msg/set-maestro/CMakeLists.txt
new file mode 100644 (file)
index 0000000..cb5ee2e
--- /dev/null
+++ b/examples/msg/set-maestro/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_executable       (set-maestro set-maestro.c)
+target_link_libraries(set-maestro simgrid)
+
+set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/set-maestro.tesh  PARENT_SCOPE)
+set(xml_files    ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/set-maestro_d.xml PARENT_SCOPE)
+set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/set-maestro.c     PARENT_SCOPE)

diff --git a/examples/msg/sendrecv/sendrecv_main.c b/examples/msg/set-maestro/set-maestro.c
similarity index 100%
rename from examples/msg/sendrecv/sendrecv_main.c
rename to examples/msg/set-maestro/set-maestro.c

diff --git a/examples/msg/sendrecv/sendrecv_CLM03_main.tesh b/examples/msg/set-maestro/set-maestro.tesh
similarity index 61%
rename from examples/msg/sendrecv/sendrecv_CLM03_main.tesh
rename to examples/msg/set-maestro/set-maestro.tesh
index 683db72..538a8c4 100644 (file)
--- a/examples/msg/sendrecv/sendrecv_CLM03_main.tesh
+++ b/examples/msg/set-maestro/set-maestro.tesh
@@ -1,11 +1,6 @@
 #! ./tesh
 
-p Testing the deprecated CM02 network model
-
-! output sort 19
-$ $SG_TEST_EXENV sendrecv/sendrecv_main$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/sendrecv/deployment_sendrecv_main.xml --cfg=cpu/model:Cas01 --cfg=network/model:CM02 "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Configuration change: Set 'cpu/model' to 'Cas01'
-> [  0.000000] (0:maestro@) Configuration change: Set 'network/model' to 'CM02'
+! output sort 19 $ $SG_TEST_EXENV set-maestro/set-maestro$EXEEXT ${srcdir:=.}/../platforms/small_platform.xml ${srcdir:=.}/set-maestro/set-maestro_d.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (1:sender@Tremblay) sender
 > [  0.000000] (1:sender@Tremblay) host = Jupiter
 > [  0.000000] (1:sender@Tremblay) task_la->data = 0.000000e+00

diff --git a/examples/msg/sendrecv/deployment_sendrecv_main.xml b/examples/msg/set-maestro/set-maestro_d.xml
similarity index 100%
rename from examples/msg/sendrecv/deployment_sendrecv_main.xml
rename to examples/msg/set-maestro/set-maestro_d.xml

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index 626d21d..f16601f 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -996,6 +996,7 @@ set(CMAKEFILES_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

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 4f5d25d..7f1fb62 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -178,7 +178,7 @@ IF(NOT enable_memcheck)
   ADD_TESH_FACTORIES(msg-sendrecv-CLM03          "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03.tesh)
   ADD_TESH_FACTORIES(msg-sendrecv-Vegas          "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Vegas.tesh)
   ADD_TESH_FACTORIES(msg-sendrecv-Reno           "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_Reno.tesh)
-  ADD_TESH_FACTORIES(msg-sendrecv-CLM03-main     "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/sendrecv_CLM03_main.tesh)
+  ADD_TESH_FACTORIES(msg-set-maestro             "thread" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/msg --cd ${CMAKE_BINARY_DIR}/examples/msg ${CMAKE_HOME_DIRECTORY}/examples/msg/set-maestro/set-maestro.tesh)
   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)
   # 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)