have a single Cmake file for tesh-msg

  +1 for trace (that might move out of the way soon)

diff --git a/.gitignore b/.gitignore
index 0a8a52e..244bd9d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -264,17 +264,17 @@ teshsuite/mc/dwarf_expression/dwarf-expression
 teshsuite/mc/replay/random_bug
 teshsuite/mc/with_mutex_handling
 teshsuite/mc/without_mutex_handling
 teshsuite/mc/replay/random_bug
 teshsuite/mc/with_mutex_handling
 teshsuite/mc/without_mutex_handling

+teshsuite/msg/concurrent_rw/concurrent_rw

 teshsuite/msg/get_sender/get_sender
 teshsuite/msg/host_on_off/host_on_off
 teshsuite/msg/get_sender/get_sender
 teshsuite/msg/host_on_off/host_on_off

-teshsuite/msg/host_on_off/host_on_off_recv
-teshsuite/msg/host_on_off/host_on_off_wait

 teshsuite/msg/host_on_off_processes/host_on_off_processes
 teshsuite/msg/host_on_off_processes/host_on_off_processes

+teshsuite/msg/host_on_off_recv/host_on_off_recv
+teshsuite/msg/host_on_off_wait/host_on_off_wait

 teshsuite/msg/listen_async/listen_async
 teshsuite/msg/pid/pid
 teshsuite/msg/process_join/process_join
 teshsuite/msg/process/process
 teshsuite/msg/listen_async/listen_async
 teshsuite/msg/pid/pid
 teshsuite/msg/process_join/process_join
 teshsuite/msg/process/process

-teshsuite/msg/storage/concurrent_rw
-teshsuite/msg/storage/storage_basic
+teshsuite/msg/storage_client_server/storage_client_server

 teshsuite/msg/task_destroy_cancel/task_destroy_cancel
 teshsuite/msg/trace/test_trace_integration
 teshsuite/simdag/availability/availability_test
 teshsuite/msg/task_destroy_cancel/task_destroy_cancel
 teshsuite/msg/trace/test_trace_integration
 teshsuite/simdag/availability/availability_test

diff --git a/teshsuite/msg/CMakeLists.txt b/teshsuite/msg/CMakeLists.txt
new file mode 100644 (file)
index 0000000..2a4f2f1
--- /dev/null
+++ b/teshsuite/msg/CMakeLists.txt
@@ -0,0 +1,14 @@
+foreach(x concurrent_rw get_sender host_on_off host_on_off_processes host_on_off_recv host_on_off_wait listen_async pid
+          process process_join storage_client_server task_destroy_cancel)
+  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(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.tesh)
+  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}/${x}.c)
+
+  ADD_TESH_FACTORIES(tesh-msg-${x} "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/${x} --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/${x} ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/${x}/${x}.tesh)
+endforeach()
+
+set(teshsuite_src ${teshsuite_src}  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}     PARENT_SCOPE)

diff --git a/teshsuite/msg/storage/concurrent_rw.c b/teshsuite/msg/concurrent_rw/concurrent_rw.c
similarity index 100%
rename from teshsuite/msg/storage/concurrent_rw.c
rename to teshsuite/msg/concurrent_rw/concurrent_rw.c

diff --git a/teshsuite/msg/storage/concurrent_rw.tesh b/teshsuite/msg/concurrent_rw/concurrent_rw.tesh
similarity index 100%
rename from teshsuite/msg/storage/concurrent_rw.tesh
rename to teshsuite/msg/concurrent_rw/concurrent_rw.tesh

diff --git a/teshsuite/msg/get_sender/CMakeLists.txt b/teshsuite/msg/get_sender/CMakeLists.txt
deleted file mode 100644 (file)
index 27ac80d..0000000
--- a/teshsuite/msg/get_sender/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (get_sender get_sender.c)
-target_link_libraries(get_sender simgrid)
-
-set(tesh_files     ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/get_sender.tesh  PARENT_SCOPE)
-set(teshsuite_src  ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/get_sender.c     PARENT_SCOPE)
-
-ADD_TESH_FACTORIES(tesh-msg-get-sender "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/get_sender ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/get_sender/get_sender.tesh)

diff --git a/teshsuite/msg/host_on_off/CMakeLists.txt b/teshsuite/msg/host_on_off/CMakeLists.txt
deleted file mode 100644 (file)
index 8349a2d..0000000
--- a/teshsuite/msg/host_on_off/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-foreach(x host_on_off host_on_off_wait host_on_off_recv)
-  add_executable       (${x} ${x}.c)
-  target_link_libraries(${x} simgrid)
-
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh)
-  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c)
-
-  ADD_TESH_FACTORIES(tesh-msg-${x} "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/host_on_off --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/host_on_off ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/host_on_off/${x}.tesh)
-endforeach()
-
-set(teshsuite_src ${teshsuite_src}                                               PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                                  PARENT_SCOPE)

diff --git a/teshsuite/msg/host_on_off_processes/CMakeLists.txt b/teshsuite/msg/host_on_off_processes/CMakeLists.txt
deleted file mode 100644 (file)
index 274fa31..0000000
--- a/teshsuite/msg/host_on_off_processes/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (host_on_off_processes host_on_off_processes.c)
-target_link_libraries(host_on_off_processes simgrid)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/host_on_off_processes.tesh   PARENT_SCOPE)
-set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/host_on_off_processes.c      PARENT_SCOPE)
-
-ADD_TESH_FACTORIES(tesh-msg-host-on-off-processes "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/host_on_off_processes --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/host_on_off_processes ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/host_on_off_processes/host_on_off_processes.tesh)

diff --git a/teshsuite/msg/host_on_off/host_on_off_recv.c b/teshsuite/msg/host_on_off_recv/host_on_off_recv.c
similarity index 100%
rename from teshsuite/msg/host_on_off/host_on_off_recv.c
rename to teshsuite/msg/host_on_off_recv/host_on_off_recv.c

diff --git a/teshsuite/msg/host_on_off/host_on_off_recv.tesh b/teshsuite/msg/host_on_off_recv/host_on_off_recv.tesh
similarity index 100%
rename from teshsuite/msg/host_on_off/host_on_off_recv.tesh
rename to teshsuite/msg/host_on_off_recv/host_on_off_recv.tesh

diff --git a/teshsuite/msg/host_on_off/host_on_off_wait.c b/teshsuite/msg/host_on_off_wait/host_on_off_wait.c
similarity index 100%
rename from teshsuite/msg/host_on_off/host_on_off_wait.c
rename to teshsuite/msg/host_on_off_wait/host_on_off_wait.c

diff --git a/teshsuite/msg/host_on_off/host_on_off_wait.tesh b/teshsuite/msg/host_on_off_wait/host_on_off_wait.tesh
similarity index 100%
rename from teshsuite/msg/host_on_off/host_on_off_wait.tesh
rename to teshsuite/msg/host_on_off_wait/host_on_off_wait.tesh

diff --git a/teshsuite/msg/listen_async/CMakeLists.txt b/teshsuite/msg/listen_async/CMakeLists.txt
deleted file mode 100644 (file)
index ebb9a72..0000000
--- a/teshsuite/msg/listen_async/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (listen_async listen_async.c)
-target_link_libraries(listen_async simgrid)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/listen_async.tesh  PARENT_SCOPE)
-set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/listen_async.c     PARENT_SCOPE)
-
-ADD_TESH_FACTORIES(tesh-msg-listen-async "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/listen_async --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/listen_async/ ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/listen_async/listen_async.tesh)

diff --git a/teshsuite/msg/pid/CMakeLists.txt b/teshsuite/msg/pid/CMakeLists.txt
deleted file mode 100644 (file)
index 7b0b4d9..0000000
--- a/teshsuite/msg/pid/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (pid pid.c)
-target_link_libraries(pid simgrid)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/pid.tesh   PARENT_SCOPE)
-set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/pid.c      PARENT_SCOPE)
-
-ADD_TESH_FACTORIES(tesh-msg-pid "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/pid --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/pid ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/pid/pid.tesh)

diff --git a/teshsuite/msg/process/CMakeLists.txt b/teshsuite/msg/process/CMakeLists.txt
deleted file mode 100644 (file)
index 28187bb..0000000
--- a/teshsuite/msg/process/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (process process.c)
-target_link_libraries(process simgrid)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/process.tesh   PARENT_SCOPE)
-set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/process.c      PARENT_SCOPE)
-
-ADD_TESH_FACTORIES(tesh-msg-process "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/process --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/process ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/process/process.tesh)

diff --git a/teshsuite/msg/process_join/CMakeLists.txt b/teshsuite/msg/process_join/CMakeLists.txt
deleted file mode 100644 (file)
index 91cbae7..0000000
--- a/teshsuite/msg/process_join/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (process_join process_join.c)
-target_link_libraries(process_join simgrid)
-
-set(tesh_files    ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/process_join.tesh   PARENT_SCOPE)
-set(teshsuite_src ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/process_join.c      PARENT_SCOPE)
-
-ADD_TESH_FACTORIES(tesh-msg-process-join "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/process_join --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/process_join ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/process_join/process_join.tesh)

diff --git a/teshsuite/msg/storage/CMakeLists.txt b/teshsuite/msg/storage/CMakeLists.txt
deleted file mode 100644 (file)
index 04e147d..0000000
--- a/teshsuite/msg/storage/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-foreach(x storage_basic concurrent_rw)
-  add_executable       (${x} ${x}.c)
-  target_link_libraries(${x} simgrid)
-
-  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh)
-  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c)
-
-  ADD_TESH_FACTORIES(tesh-msg-${x} "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/storage --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/storage ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/storage/${x}.tesh)
-endforeach()
-
-set(tesh_files    ${tesh_files}                                                    PARENT_SCOPE)
-set(teshsuite_src ${teshsuite_src}                                                 PARENT_SCOPE)
-

diff --git a/teshsuite/msg/storage/storage_basic.c b/teshsuite/msg/storage_client_server/storage_client_server.c
similarity index 100%
rename from teshsuite/msg/storage/storage_basic.c
rename to teshsuite/msg/storage_client_server/storage_client_server.c

diff --git a/teshsuite/msg/storage/storage_basic.tesh b/teshsuite/msg/storage_client_server/storage_client_server.tesh
similarity index 98%
rename from teshsuite/msg/storage/storage_basic.tesh
rename to teshsuite/msg/storage_client_server/storage_client_server.tesh
index 2aa51a3..6399cd7 100644 (file)
--- a/teshsuite/msg/storage/storage_basic.tesh
+++ b/teshsuite/msg/storage_client_server/storage_client_server.tesh
@@ -1,4 +1,4 @@
-$ ./storage_basic$EXEEXT ${srcdir:=.}/../../../examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+$ ./storage_client_server$EXEEXT ${srcdir:=.}/../../../examples/platforms/storage/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"

 > [  0.000000] (1:server@alice) *** Storage info on alice ***
 > [  0.000000] (1:server@alice)        Storage name: Disk2, mount name: c:
 > [  0.000000] (1:server@alice)                Free size: 534479374867 bytes
 > [  0.000000] (1:server@alice) *** Storage info on alice ***
 > [  0.000000] (1:server@alice)        Storage name: Disk2, mount name: c:
 > [  0.000000] (1:server@alice)                Free size: 534479374867 bytes

diff --git a/teshsuite/msg/task_destroy_cancel/CMakeLists.txt b/teshsuite/msg/task_destroy_cancel/CMakeLists.txt
deleted file mode 100644 (file)
index ad57cd7..0000000
--- a/teshsuite/msg/task_destroy_cancel/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-add_executable       (task_destroy_cancel task_destroy_cancel.c)
-target_link_libraries(task_destroy_cancel simgrid)
-
-set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/task_destroy_cancel.tesh  PARENT_SCOPE)
-set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/task_destroy_cancel.c     PARENT_SCOPE)
-
-ADD_TESH_FACTORIES(tesh-msg-task-destroy-cancel "thread;ucontext;raw" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/msg/task_destroy_cancel --cd ${CMAKE_BINARY_DIR}/teshsuite/msg/task_destroy_cancel ${CMAKE_HOME_DIRECTORY}/teshsuite/msg/task_destroy_cancel/task_destroy_cancel.tesh)

diff --git a/tools/cmake/DefinePackages.cmake b/tools/cmake/DefinePackages.cmake
index d5df41a..af5fae0 100644 (file)
--- a/tools/cmake/DefinePackages.cmake
+++ b/tools/cmake/DefinePackages.cmake
@@ -988,20 +988,15 @@ set(CMAKEFILES_TXT
   examples/smpi/energy/f90/CMakeLists.txt
 
   teshsuite/java/CMakeLists.txt
   examples/smpi/energy/f90/CMakeLists.txt
 
   teshsuite/java/CMakeLists.txt

+

   teshsuite/mc/CMakeLists.txt
   teshsuite/mc/dwarf/CMakeLists.txt
   teshsuite/mc/dwarf_expression/CMakeLists.txt
   teshsuite/mc/replay/CMakeLists.txt
   teshsuite/mc/CMakeLists.txt
   teshsuite/mc/dwarf/CMakeLists.txt
   teshsuite/mc/dwarf_expression/CMakeLists.txt
   teshsuite/mc/replay/CMakeLists.txt

-  teshsuite/msg/get_sender/CMakeLists.txt
-  teshsuite/msg/host_on_off/CMakeLists.txt
-  teshsuite/msg/host_on_off_processes/CMakeLists.txt
-  teshsuite/msg/listen_async/CMakeLists.txt
-  teshsuite/msg/pid/CMakeLists.txt
-  teshsuite/msg/process/CMakeLists.txt
-  teshsuite/msg/process_join/CMakeLists.txt
-  teshsuite/msg/storage/CMakeLists.txt
-  teshsuite/msg/task_destroy_cancel/CMakeLists.txt
+
+  teshsuite/msg/CMakeLists.txt

   teshsuite/msg/trace/CMakeLists.txt
   teshsuite/msg/trace/CMakeLists.txt

+

   teshsuite/simdag/availability/CMakeLists.txt
   teshsuite/simdag/basic/CMakeLists.txt
   teshsuite/simdag/incomplete/CMakeLists.txt
   teshsuite/simdag/availability/CMakeLists.txt
   teshsuite/simdag/basic/CMakeLists.txt
   teshsuite/simdag/incomplete/CMakeLists.txt


@@ -1009,6 +1004,7 @@ set(CMAKEFILES_TXT
   teshsuite/simdag/network/p2p/CMakeLists.txt
   teshsuite/simdag/partask/CMakeLists.txt
   teshsuite/simdag/platforms/CMakeLists.txt
   teshsuite/simdag/network/p2p/CMakeLists.txt
   teshsuite/simdag/partask/CMakeLists.txt
   teshsuite/simdag/platforms/CMakeLists.txt

+

   teshsuite/simix/check_defaults/CMakeLists.txt
   teshsuite/simix/stack_overflow/CMakeLists.txt
   
   teshsuite/simix/check_defaults/CMakeLists.txt
   teshsuite/simix/stack_overflow/CMakeLists.txt