move smpi examples to teshsuite

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 40e5175..f5f0d43 100644 (file)
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -468,29 +468,29 @@ if(NOT enable_memcheck)
 
   if(enable_smpi)
     # smpi examples
-    ADD_TEST(smpi-bcast-thread                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
-    ADD_TEST(smpi-reduce-thread                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
-    ADD_TEST(smpi-vector-thread                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/vector.tesh)
-    ADD_TEST(smpi-indexed-thread                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/indexed.tesh)
-    ADD_TEST(smpi-struct-thread                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/struct.tesh)
-    ADD_TEST(smpi-pt2pt-thread                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/pt2pt.tesh)
+    ADD_TEST(smpi-bcast-thread                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast.tesh)
+    ADD_TEST(smpi-reduce-thread                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce.tesh)
+    ADD_TEST(smpi-vector-thread                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/vector.tesh)
+    ADD_TEST(smpi-indexed-thread                ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/indexed.tesh)
+    ADD_TEST(smpi-struct-thread                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/struct.tesh)
+    ADD_TEST(smpi-pt2pt-thread                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:thread --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pt2pt.tesh)
 
     if(HAVE_RAWCTX)
-      ADD_TEST(smpi-bcast-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
-      ADD_TEST(smpi-reduce-raw                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
-      ADD_TEST(smpi-vector-raw                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/vector.tesh)
-      ADD_TEST(smpi-indexed-raw                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/indexed.tesh)
-      ADD_TEST(smpi-struct-raw                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/struct.tesh)
-      ADD_TEST(smpi-pt2pt-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/pt2pt.tesh)
+      ADD_TEST(smpi-bcast-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast.tesh)
+      ADD_TEST(smpi-reduce-raw                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce.tesh)
+      ADD_TEST(smpi-vector-raw                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/vector.tesh)
+      ADD_TEST(smpi-indexed-raw                 ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/indexed.tesh)
+      ADD_TEST(smpi-struct-raw                  ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/struct.tesh)
+      ADD_TEST(smpi-pt2pt-raw                   ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pt2pt.tesh)
 
     endif(HAVE_RAWCTX)
     if(CONTEXT_UCONTEXT)
-      ADD_TEST(smpi-bcast-ucontext              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/bcast.tesh)
-      ADD_TEST(smpi-reduce-ucontext             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/reduce.tesh)
-      ADD_TEST(smpi-vector-ucontex              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/vector.tesh)
-      ADD_TEST(smpi-indexed-ucontext            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/indexed.tesh)
-      ADD_TEST(smpi-struct-ucontext             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/struct.tesh)
-      ADD_TEST(smpi-pt2pt-ucontext              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/pt2pt.tesh)
+      ADD_TEST(smpi-bcast-ucontext              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/bcast.tesh)
+      ADD_TEST(smpi-reduce-ucontext             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/reduce.tesh)
+      ADD_TEST(smpi-vector-ucontex              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/vector.tesh)
+      ADD_TEST(smpi-indexed-ucontext            ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/indexed.tesh)
+      ADD_TEST(smpi-struct-ucontext             ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/struct.tesh)
+      ADD_TEST(smpi-pt2pt-ucontext              ${CMAKE_BINARY_DIR}/bin/tesh ${TESH_OPTION} --cfg contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/teshsuite/smpi ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/pt2pt.tesh)
     
     endif(CONTEXT_UCONTEXT)
     if(HAVE_TRACING)

diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 5f609b0..8181b0c 100644 (file)
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -745,6 +745,7 @@ set(TESHSUITE_CMAKEFILES_TXT
   teshsuite/simdag/partask/CMakeLists.txt
   teshsuite/simdag/platforms/CMakeLists.txt
   teshsuite/xbt/CMakeLists.txt
+  teshsuite/smpi/CMakeLists.txt
   )
 
 set(TOOLS_CMAKEFILES_TXT

diff --git a/buildtools/Cmake/MakeExe.cmake b/buildtools/Cmake/MakeExe.cmake
index 41f8d0e..87d8221 100644 (file)
--- a/buildtools/Cmake/MakeExe.cmake
+++ b/buildtools/Cmake/MakeExe.cmake
@@ -29,6 +29,7 @@ add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms)
+add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/smpi)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/teshsuite/msg/trace)
 

diff --git a/examples/smpi/CMakeLists.txt b/examples/smpi/CMakeLists.txt
index 3bf1d3a..b91a3c1 100644 (file)
--- a/examples/smpi/CMakeLists.txt
+++ b/examples/smpi/CMakeLists.txt
@@ -7,67 +7,27 @@ if(enable_smpi)
 
   include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
 
-  add_executable(alltoall2 alltoall2.c )
-  add_executable(alltoall_basic alltoall_basic.c)
-  add_executable(alltoallv alltoallv.c)
-  add_executable(allreduce allreduce.c)
-  add_executable(bcast bcast.c)
+
   add_executable(bcbench bcbench.c)
-  add_executable(compute compute.c)
-  add_executable(compute2 compute2.c)
-  add_executable(compute3 compute3.c)
-  add_executable(pingpong pingpong.c)
-  add_executable(scatter scatter.c)
-  add_executable(reduce reduce.c)
-  add_executable(split split.c)
-  add_executable(dsend dsend.c)
   add_executable(mvmul mvmul.c)
-  add_executable(smpi_sendrecv sendrecv.c)
   add_executable(smpi_traced tracing/smpi_traced.c)
   add_executable(smpi_traced_simple tracing/smpi_traced_simple.c)
-  add_executable(ttest01 ttest01.c)
-  add_executable(vector_test vector_test.c)
-  add_executable(hvector_test hvector_test.c)
-  add_executable(indexed_test indexed_test.c)
-  add_executable(struct_test struct_test.c)
   add_executable(mc_bugged1 mc_bugged1.c)
   add_executable(mc_bugged2 mc_bugged2.c)
   add_executable(smpi_replay replay/replay.c)
 
-  target_link_libraries(alltoall2 m simgrid smpi )
-  target_link_libraries(alltoall_basic m simgrid smpi )
-  target_link_libraries(alltoallv m simgrid smpi )
-  target_link_libraries(allreduce m simgrid smpi )
-  target_link_libraries(bcast m simgrid smpi )
   target_link_libraries(bcbench m simgrid smpi )
-  target_link_libraries(compute m simgrid smpi )
-  target_link_libraries(compute2 m simgrid smpi )
-  target_link_libraries(compute3 m simgrid smpi )
-  target_link_libraries(pingpong m simgrid smpi )
-  target_link_libraries(scatter m simgrid smpi )
-  target_link_libraries(reduce m simgrid smpi )
-  target_link_libraries(split m simgrid smpi )
-  target_link_libraries(dsend m simgrid smpi )
   target_link_libraries(mvmul m simgrid smpi )
-  target_link_libraries(smpi_sendrecv m simgrid smpi )
   target_link_libraries(smpi_traced m simgrid smpi )
   target_link_libraries(smpi_traced_simple m simgrid smpi )
-  target_link_libraries(ttest01 m simgrid smpi )
-  target_link_libraries(vector_test m simgrid smpi )
-  target_link_libraries(hvector_test m simgrid smpi )
-  target_link_libraries(indexed_test m simgrid smpi )
-  target_link_libraries(struct_test m simgrid smpi )
   target_link_libraries(mc_bugged1 m simgrid smpi )
   target_link_libraries(mc_bugged2 m simgrid smpi )
   target_link_libraries(smpi_replay m simgrid smpi )
 
-  set_target_properties(smpi_sendrecv PROPERTIES RENAME sendrecv)
 endif(enable_smpi)
 
 set(tesh_files
   ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/bcast.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/reduce.tesh
   ${CMAKE_CURRENT_SOURCE_DIR}/tracing/smpi_traced.tesh
   PARENT_SCOPE
   )
@@ -77,32 +37,10 @@ set(xml_files
   )
 set(examples_src
   ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mc_bugged2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/get_processor_name.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/pingpong.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/bcast.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/allreduce.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_basic.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mc_bugged1.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/reduce.c
   ${CMAKE_CURRENT_SOURCE_DIR}/mvmul.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/compute2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/split.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/dsend.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/ttest01.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/compute.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/compute3.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/alltoall2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/scatter.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sendtest.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/barrier.c
   ${CMAKE_CURRENT_SOURCE_DIR}/bcbench.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/vector_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/hvector_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/indexed_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/struct_test.c
   ${CMAKE_CURRENT_SOURCE_DIR}/replay/replay.c
   ${CMAKE_CURRENT_SOURCE_DIR}/tracing/smpi_traced.c
   ${CMAKE_CURRENT_SOURCE_DIR}/tracing/smpi_traced_simple.c

diff --git a/teshsuite/smpi/CMakeLists.txt b/teshsuite/smpi/CMakeLists.txt
new file mode 100644 (file)
index 0000000..c5950e1
--- /dev/null
+++ b/teshsuite/smpi/CMakeLists.txt
@@ -0,0 +1,97 @@
+cmake_minimum_required(VERSION 2.6)
+
+if(enable_smpi)
+  set(CMAKE_C_COMPILER "${CMAKE_BINARY_DIR}/bin/smpicc")
+
+  set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
+
+  include_directories("${CMAKE_HOME_DIRECTORY}/include/smpi")
+
+  add_executable(alltoall2 alltoall2.c )
+  add_executable(alltoall_basic alltoall_basic.c)
+  add_executable(alltoallv alltoallv.c)
+  add_executable(allreduce allreduce.c)
+  add_executable(bcast bcast.c)
+  add_executable(compute compute.c)
+  add_executable(compute2 compute2.c)
+  add_executable(compute3 compute3.c)
+  add_executable(pingpong pingpong.c)
+  add_executable(scatter scatter.c)
+  add_executable(reduce reduce.c)
+  add_executable(split split.c)
+  add_executable(dsend dsend.c)
+  add_executable(smpi_sendrecv sendrecv.c)
+  add_executable(ttest01 ttest01.c)
+  add_executable(vector_test vector_test.c)
+  add_executable(hvector_test hvector_test.c)
+  add_executable(indexed_test indexed_test.c)
+  add_executable(struct_test struct_test.c)
+
+  target_link_libraries(alltoall2 m simgrid smpi )
+  target_link_libraries(alltoall_basic m simgrid smpi )
+  target_link_libraries(alltoallv m simgrid smpi )
+  target_link_libraries(allreduce m simgrid smpi )
+  target_link_libraries(bcast m simgrid smpi )
+  target_link_libraries(compute m simgrid smpi )
+  target_link_libraries(compute2 m simgrid smpi )
+  target_link_libraries(compute3 m simgrid smpi )
+  target_link_libraries(pingpong m simgrid smpi )
+  target_link_libraries(scatter m simgrid smpi )
+  target_link_libraries(reduce m simgrid smpi )
+  target_link_libraries(split m simgrid smpi )
+  target_link_libraries(dsend m simgrid smpi )
+  target_link_libraries(smpi_sendrecv m simgrid smpi )
+  target_link_libraries(ttest01 m simgrid smpi )
+  target_link_libraries(vector_test m simgrid smpi )
+  target_link_libraries(hvector_test m simgrid smpi )
+  target_link_libraries(indexed_test m simgrid smpi )
+  target_link_libraries(struct_test m simgrid smpi )
+
+  set_target_properties(smpi_sendrecv PROPERTIES RENAME sendrecv)
+endif(enable_smpi)
+
+set(tesh_files
+  ${tesh_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/bcast.tesh
+  ${CMAKE_CURRENT_SOURCE_DIR}/reduce.tesh
+  PARENT_SCOPE
+  )
+set(xml_files
+  ${xml_files}
+  PARENT_SCOPE
+  )
+set(examples_src
+  ${examples_src}
+  ${CMAKE_CURRENT_SOURCE_DIR}/alltoallv.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/get_processor_name.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/pingpong.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/bcast.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/allreduce.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/alltoall_basic.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sendrecv.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/reduce.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/compute2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/split.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/dsend.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/ttest01.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/compute.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/compute3.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/alltoall2.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/scatter.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/sendtest.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/barrier.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/vector_test.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/hvector_test.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/indexed_test.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/struct_test.c
+  PARENT_SCOPE
+  )
+set(bin_files
+  ${bin_files}
+  ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
+  PARENT_SCOPE
+  )
+set(txt_files
+  ${txt_files}
+  PARENT_SCOPE
+  )

diff --git a/examples/smpi/allreduce.c b/teshsuite/smpi/allreduce.c
similarity index 100%
rename from examples/smpi/allreduce.c
rename to teshsuite/smpi/allreduce.c

diff --git a/examples/smpi/alltoall2.c b/teshsuite/smpi/alltoall2.c
similarity index 100%
rename from examples/smpi/alltoall2.c
rename to teshsuite/smpi/alltoall2.c

diff --git a/examples/smpi/alltoall_basic.c b/teshsuite/smpi/alltoall_basic.c
similarity index 100%
rename from examples/smpi/alltoall_basic.c
rename to teshsuite/smpi/alltoall_basic.c

diff --git a/examples/smpi/alltoallv.c b/teshsuite/smpi/alltoallv.c
similarity index 100%
rename from examples/smpi/alltoallv.c
rename to teshsuite/smpi/alltoallv.c

diff --git a/examples/smpi/barrier.c b/teshsuite/smpi/barrier.c
similarity index 100%
rename from examples/smpi/barrier.c
rename to teshsuite/smpi/barrier.c

diff --git a/examples/smpi/bcast.c b/teshsuite/smpi/bcast.c
similarity index 100%
rename from examples/smpi/bcast.c
rename to teshsuite/smpi/bcast.c

diff --git a/examples/smpi/bcast.tesh b/teshsuite/smpi/bcast.tesh
similarity index 91%
rename from examples/smpi/bcast.tesh
rename to teshsuite/smpi/bcast.tesh
index 5a40103..dc7a796 100644 (file)
--- a/examples/smpi/bcast.tesh
+++ b/teshsuite/smpi/bcast.tesh
@@ -2,7 +2,7 @@
 # (since we want to pass it to the child, it has to be redefined before each command)
 # Go for the first test
 p Test Broadcast with less processes than hosts
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 3 ./bcast -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 3 ./bcast -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -14,7 +14,7 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/
 # second test
 p Test Broadcast with as much processes than hosts
 ! setenv LD_LIBRARY_PATH=../../lib
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 5 ./bcast -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 5 ./bcast -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -28,7 +28,7 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/
 # Another test
 p Test Broadcast with more processes than hosts
 ! setenv LD_LIBRARY_PATH=../../lib
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 12 ./bcast -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 12 ./bcast -q
 > You requested to use 12 processes, but there is only 5 processes in your hostfile...
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter

diff --git a/examples/smpi/compute.c b/teshsuite/smpi/compute.c
similarity index 100%
rename from examples/smpi/compute.c
rename to teshsuite/smpi/compute.c

diff --git a/examples/smpi/compute2.c b/teshsuite/smpi/compute2.c
similarity index 100%
rename from examples/smpi/compute2.c
rename to teshsuite/smpi/compute2.c

diff --git a/examples/smpi/compute3.c b/teshsuite/smpi/compute3.c
similarity index 100%
rename from examples/smpi/compute3.c
rename to teshsuite/smpi/compute3.c

diff --git a/examples/smpi/dsend.c b/teshsuite/smpi/dsend.c
similarity index 100%
rename from examples/smpi/dsend.c
rename to teshsuite/smpi/dsend.c

diff --git a/examples/smpi/get_processor_name.c b/teshsuite/smpi/get_processor_name.c
similarity index 100%
rename from examples/smpi/get_processor_name.c
rename to teshsuite/smpi/get_processor_name.c

diff --git a/teshsuite/smpi/hostfile b/teshsuite/smpi/hostfile
new file mode 100644 (file)
index 0000000..ee2e281
--- /dev/null
+++ b/teshsuite/smpi/hostfile
@@ -0,0 +1,6 @@
+Tremblay
+Jupiter
+Fafard
+Ginette
+Bourassa
+         
\ No newline at end of file

diff --git a/examples/smpi/hvector.tesh b/teshsuite/smpi/hvector.tesh
similarity index 62%
rename from examples/smpi/hvector.tesh
rename to teshsuite/smpi/hvector.tesh
index e3399b2..9eb822d 100644 (file)
--- a/examples/smpi/hvector.tesh
+++ b/teshsuite/smpi/hvector.tesh
@@ -1,4 +1,4 @@
 p Test indexed
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 2 ./indexed_test -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./indexed_test -q

diff --git a/examples/smpi/hvector_test.c b/teshsuite/smpi/hvector_test.c
similarity index 100%
rename from examples/smpi/hvector_test.c
rename to teshsuite/smpi/hvector_test.c

diff --git a/examples/smpi/indexed.tesh b/teshsuite/smpi/indexed.tesh
similarity index 92%
rename from examples/smpi/indexed.tesh
rename to teshsuite/smpi/indexed.tesh
index 690c08e..2fffcea 100644 (file)
--- a/examples/smpi/indexed.tesh
+++ b/teshsuite/smpi/indexed.tesh
@@ -1,7 +1,7 @@
 p Test indexed
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 2 ./indexed_test -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./indexed_test -q
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'

diff --git a/examples/smpi/indexed_test.c b/teshsuite/smpi/indexed_test.c
similarity index 100%
rename from examples/smpi/indexed_test.c
rename to teshsuite/smpi/indexed_test.c

diff --git a/examples/smpi/pingpong.c b/teshsuite/smpi/pingpong.c
similarity index 100%
rename from examples/smpi/pingpong.c
rename to teshsuite/smpi/pingpong.c

diff --git a/examples/smpi/pt2pt.tesh b/teshsuite/smpi/pt2pt.tesh
similarity index 93%
rename from examples/smpi/pt2pt.tesh
rename to teshsuite/smpi/pt2pt.tesh
index ce70d88..8f424ef 100644 (file)
--- a/examples/smpi/pt2pt.tesh
+++ b/teshsuite/smpi/pt2pt.tesh
@@ -1,7 +1,7 @@
 p Test dsend
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 2 ./dsend -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./dsend -q
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'
@@ -15,7 +15,7 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/
 p Test pingpong
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 4 ./pingpong -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 4 ./pingpong -q
 > *** Ping-pong test (MPI_Send/MPI_Recv) ***
 > == pivot=0 : pingpong [0] <--> [1]
 > == pivot=1 : pingpong [1] <--> [2]

diff --git a/examples/smpi/reduce.c b/teshsuite/smpi/reduce.c
similarity index 100%
rename from examples/smpi/reduce.c
rename to teshsuite/smpi/reduce.c

diff --git a/examples/smpi/reduce.tesh b/teshsuite/smpi/reduce.tesh
similarity index 92%
rename from examples/smpi/reduce.tesh
rename to teshsuite/smpi/reduce.tesh
index 4c7f93f..aa7dec0 100644 (file)
--- a/examples/smpi/reduce.tesh
+++ b/teshsuite/smpi/reduce.tesh
@@ -2,7 +2,7 @@
 # (since we want to pass it to the child, it has to be redefined before each command)
 # Go for the first test
 p Test Reduce with 3 processes
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 3 ./reduce -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 3 ./reduce -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -22,7 +22,7 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/
 # second test
 ! setenv LD_LIBRARY_PATH=../../lib
 p Test Reduce with 5 processes
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 5 ./reduce -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 5 ./reduce -q
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter
 > [rank 2] -> Fafard
@@ -46,7 +46,7 @@ $ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/
 # third test
 ! setenv LD_LIBRARY_PATH=../../lib
 p Test Reduce with 12 processes
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 12 ./reduce -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 12 ./reduce -q
 > You requested to use 12 processes, but there is only 5 processes in your hostfile...
 > [rank 0] -> Tremblay
 > [rank 1] -> Jupiter

diff --git a/examples/smpi/scatter.c b/teshsuite/smpi/scatter.c
similarity index 100%
rename from examples/smpi/scatter.c
rename to teshsuite/smpi/scatter.c

diff --git a/examples/smpi/sendrecv.c b/teshsuite/smpi/sendrecv.c
similarity index 100%
rename from examples/smpi/sendrecv.c
rename to teshsuite/smpi/sendrecv.c

diff --git a/examples/smpi/sendtest.c b/teshsuite/smpi/sendtest.c
similarity index 100%
rename from examples/smpi/sendtest.c
rename to teshsuite/smpi/sendtest.c

diff --git a/examples/smpi/split.c b/teshsuite/smpi/split.c
similarity index 100%
rename from examples/smpi/split.c
rename to teshsuite/smpi/split.c

diff --git a/examples/smpi/struct.tesh b/teshsuite/smpi/struct.tesh
similarity index 90%
rename from examples/smpi/struct.tesh
rename to teshsuite/smpi/struct.tesh
index 0d3c6f3..2fd7c71 100644 (file)
--- a/examples/smpi/struct.tesh
+++ b/teshsuite/smpi/struct.tesh
@@ -1,7 +1,7 @@
 p Test struct
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 2 ./struct_test -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./struct_test -q
 > Process 0 got -2 (-2?) and 8.000000 (8.0?), tab (should be all 0): 0 0 0 0 0 0 
 > Process 1 got -2 (-2?) and 8.000000 (8.0?), tab (should be all 0): 0 0 0 0 0 0 
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)

diff --git a/examples/smpi/struct_test.c b/teshsuite/smpi/struct_test.c
similarity index 100%
rename from examples/smpi/struct_test.c
rename to teshsuite/smpi/struct_test.c

diff --git a/examples/smpi/ttest01.c b/teshsuite/smpi/ttest01.c
similarity index 100%
rename from examples/smpi/ttest01.c
rename to teshsuite/smpi/ttest01.c

diff --git a/examples/smpi/vector.tesh b/teshsuite/smpi/vector.tesh
similarity index 94%
rename from examples/smpi/vector.tesh
rename to teshsuite/smpi/vector.tesh
index 9004c89..83d4939 100644 (file)
--- a/examples/smpi/vector.tesh
+++ b/teshsuite/smpi/vector.tesh
@@ -1,7 +1,7 @@
 p Test vector
 ! setenv LD_LIBRARY_PATH=../../lib
 ! output sort
-$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../msg/small_platform.xml -np 2 ./vector_test -q
+$ ../../bin/smpirun -map -hostfile ${srcdir:=.}/hostfile -platform ${srcdir:=.}/../../examples/msg/small_platform.xml -np 2 ./vector_test -q
 > [0.000000] [surf_config/INFO] Switching workstation model to compound since you changed the network and/or cpu model(s)
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '1e-9'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'SMPI'

diff --git a/examples/smpi/vector_test.c b/teshsuite/smpi/vector_test.c
similarity index 100%
rename from examples/smpi/vector_test.c
rename to teshsuite/smpi/vector_test.c