Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
mv ADD_TESH to the right CMakeLists.txt
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 7 Mar 2016 21:45:07 +0000 (22:45 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Mon, 7 Mar 2016 21:45:07 +0000 (22:45 +0100)
examples/smpi/CMakeLists.txt
examples/smpi/energy/CMakeLists.txt
examples/smpi/energy/f77/CMakeLists.txt
examples/smpi/energy/f90/CMakeLists.txt
examples/smpi/replay_multiple/CMakeLists.txt
examples/smpi/replay_multiple/README
examples/smpi/smpi_msg_masterslave/CMakeLists.txt
teshsuite/smpi/compute/CMakeLists.txt
tools/cmake/Tests.cmake

index 9f1788a..cd06554 100644 (file)
@@ -20,61 +20,46 @@ if(enable_smpi)
   target_link_libraries(smpi_replay        simgrid)
 
   if(HAVE_MC)
-    foreach(x bugged1 bugged2 bugged1_liveness only_send_deterministic mutual_exclusion non_termination1 non_termination2 non_termination3 non_termination4)
+    foreach(x bugged1 bugged2 bugged1_liveness only_send_deterministic mutual_exclusion non_termination1 
+              non_termination2 non_termination3 non_termination4)
       add_executable       (smpi_${x} mc/${x}.c)
       target_link_libraries(smpi_${x} simgrid)
       set_target_properties(smpi_${x} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "./mc")
-    endforeach()    
+      set(examples_src  ${examples_src} mc/${x}.c)
+    endforeach()
+    ADD_TESH(smpi-mc-only-send-determinism -setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/mc --cd ${CMAKE_BINARY_DIR}/examples/smpi/mc ${CMAKE_HOME_DIRECTORY}/examples/smpi/mc/only_send_deterministic.tesh)
   endif()
+
+ADD_TESH(smpi-tracing-ptp   --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh)
+ADD_TESH(smpi-replay-simple --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/smpi_replay.tesh)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/tracing/smpi_traced.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/smpi_replay.tesh
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/mvmul.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/bcbench.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
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/bugged2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/bugged1.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/bugged1_liveness.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/only_send_deterministic.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/mutual_exclusion.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/non_termination1.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/non_termination2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/non_termination3.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/non_termination4.c
-  PARENT_SCOPE)
-set(bin_files
-  ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/promela_bugged1_liveness
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_bugged1_liveness
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_bugged1
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_bugged2
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_only_send_deterministic
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_mutual_exclusion
-  ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_non_termination
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions0.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions1.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_allReduce.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_allgatherv.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_alltoall.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_alltoallv.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_barrier.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_bcast.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_bcast_reduce_datatypes.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_gather.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_reducescatter.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_waitall.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_with_isend.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay/split_traces
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/tracing/smpi_traced.tesh
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/smpi_replay.tesh                     PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/mvmul.c
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/bcbench.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                PARENT_SCOPE)
+set(bin_files     ${bin_files}     ${CMAKE_CURRENT_SOURCE_DIR}/hostfile
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/mc/promela_bugged1_liveness
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_bugged1_liveness
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_bugged1
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_bugged2
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_only_send_deterministic
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_mutual_exclusion
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/mc/hostfile_non_termination                 PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions0.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions1.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_allReduce.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_allgatherv.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_alltoall.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_alltoallv.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_barrier.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_bcast.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_bcast_reduce_datatypes.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_gather.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_reducescatter.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_waitall.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/actions_with_isend.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/replay/split_traces                         PARENT_SCOPE)
index 9493a50..03ec674 100644 (file)
@@ -8,6 +8,7 @@ if(enable_smpi)
 
   add_executable       (se se.c)
   target_link_libraries(se simgrid)
+  ADD_TESH_FACTORIES(smpi-energy "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/energy --cd ${CMAKE_BINARY_DIR}/examples/smpi/energy ${CMAKE_HOME_DIRECTORY}/examples/smpi/energy/energy.tesh)
 endif()
 
 set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/energy.tesh  PARENT_SCOPE)
index d63417e..78cd9e7 100644 (file)
@@ -1,8 +1,8 @@
 if(enable_smpi AND SMPI_FORTRAN)
   set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpiff")
-
   add_executable       (sef sef.f)
   target_link_libraries(sef simgrid)
+  ADD_TESH_FACTORIES(smpi-energy-f77 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/energy --cd ${CMAKE_BINARY_DIR}/examples/smpi/energy ${CMAKE_HOME_DIRECTORY}/examples/smpi/energy/f77/energy.tesh)
 endif()
 
 set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/energy.tesh  PARENT_SCOPE)
index 3cca67f..09922f7 100644 (file)
@@ -1,8 +1,8 @@
 if(enable_smpi AND SMPI_FORTRAN)
   set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/smpi_script/bin/smpif90")
-
   add_executable       (sef90 sef90.f90)
   target_link_libraries(sef90 simgrid)
+  ADD_TESH_FACTORIES(smpi-energy-f90 "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/energy --cd ${CMAKE_BINARY_DIR}/examples/smpi/energy ${CMAKE_HOME_DIRECTORY}/examples/smpi/energy/f90/energy.tesh)
 endif()
 
 set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/energy.tesh  PARENT_SCOPE)
index cd9186c..3802996 100644 (file)
@@ -3,53 +3,47 @@ if(enable_smpi)
 
   add_executable       (replay_multiple replay_multiple.c)
   target_link_libraries(replay_multiple simgrid)
+  IF(NOT HAVE_MC)
+    ADD_TESH(smpi-replay-multiple --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple --cd ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple/replay_multiple.tesh)
+  ENDIF()
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple.tesh
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple.c
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/generate_multiple_deployment.sh
-  ${CMAKE_CURRENT_SOURCE_DIR}/description_file
-  ${CMAKE_CURRENT_SOURCE_DIR}/README
-  ${CMAKE_CURRENT_SOURCE_DIR}/smpi_replay.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace0.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace1.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace2.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace3.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace4.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace5.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace6.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace7.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace8.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace9.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace10.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace11.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace12.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace13.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace14.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace15.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace16.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace17.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace18.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace19.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace20.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace21.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace22.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace23.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace24.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace25.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace26.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace27.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace28.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace29.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace30.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace31.txt
-  PARENT_SCOPE)
+set(txt_files     ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/generate_multiple_deployment.sh
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/description_file
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/README
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/smpi_replay.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace0.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace1.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace2.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace3.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace4.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace5.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace6.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace7.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace8.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace9.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace10.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace11.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace12.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace13.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace14.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace15.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace16.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace17.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace18.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace19.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace20.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace21.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace22.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace23.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace24.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace25.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace26.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace27.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace28.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace29.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace30.txt
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/ti_traces_32_1/ti_trace31.txt  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple.tesh           PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/replay_multiple.c              PARENT_SCOPE)
 
index bf3ef34..f56e3d7 100644 (file)
@@ -1,11 +1,8 @@
-This is an example of the replay of several traces in the same simulation,
- in order to watch how they interact on a platform.
-
+This is an example of the replay of several traces in the same simulation, to watch how they interact on a platform.
 
 The main item of this example is the description file
 
-The description_file file is an example of the launching of 2 replay traces 
-(both of the same application/size).
+The description_file file is an example of the launching of 2 replay traces (both of the same application/size).
 
 Each line has the form :
 
@@ -15,26 +12,19 @@ example :
 
 2 smpi_replay.txt 32 125000000000
 
-This launchs an instance "2" that will replay file smpi_replay.txt with 32 
-processes, and each one of these processes will sleep for 125000000000 flops 
-before the run.
+This launchs an instance "2" that will replay file smpi_replay.txt with 32 processes, and each one of these processes 
+will sleep for 125000000000 flops before the run.
 
+In order to be replayed, a deployment file must be generatedfrom this description file, and from the intended platform 
+file and hostfiles. The script generate_multiple_deployment.sh can be used as such : 
 
-In order to be replayed, a deployment file must be generated 
-from this description file, and from the intended platform file and hostfiles. 
-The script generate_multiple_deployment.sh can be used as such : 
+./generate_multiple_deployment.sh -platform platform_file.xml -hostfile hostfile  description_file deployment.xml
 
-./generate_multiple_deployment.sh -platform platform_file.xml 
-   -hostfile hostfile  description_file deployment.xml
-   
 The output deployment file will be written in deployment.xml
 
-Please not that the deployment will use the hostfile in order, placing processes 
-of the first instance using the first node, and the ones of the following 
-instances on the following nodes.
+Please not that the deployment will use the hostfile in order, placing processes of the first instance using the first 
+node, and the ones of the following instances on the following nodes.
 
 The actual replay can now be launched, using classic options for SMPI
 
 ./replay_multiple description_file platform_file.xml deployment.xml --cfg=... --log=...
-
-
index 7860ddc..2170f92 100644 (file)
@@ -3,6 +3,7 @@ if(enable_smpi)
 
   add_executable       (masterslave_mailbox_smpi masterslave_mailbox_smpi.c)
   target_link_libraries(masterslave_mailbox_smpi simgrid)
+  ADD_TESH_FACTORIES(smpi-msg-masterslave "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave --cd ${CMAKE_BINARY_DIR}/examples/smpi/smpi_msg_masterslave ${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh)
 endif()
 
 set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/msg_smpi.tesh                            PARENT_SCOPE)
index 51849df..fc11182 100644 (file)
@@ -12,6 +12,7 @@ if(enable_smpi)
   target_link_libraries(compute2 simgrid)
   add_executable       (compute3 compute3.c)
   target_link_libraries(compute3 simgrid)
+  ADD_TESH_FACTORIES(tesh-smpi-compute "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/compute --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/compute compute.tesh)
 endif()
 
 set(tesh_files
index 65bb4e9..d158cac 100644 (file)
@@ -73,7 +73,7 @@ IF(NOT enable_memcheck)
       ADD_TESH(mc-bugged1-liveness-visited-ucontext --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness_visited.tesh)
       ADD_TESH(mc-bugged1-liveness-visited-ucontext-sparse --setenv bindir=${CMAKE_BINARY_DIR}/examples/msg/mc --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/mc bugged1_liveness_visited_sparse.tesh)
     if(HAVE_C_STACK_CLEANER)
-      # This test checks if the stack cleaner is makign a difference:
+      # This test checks if the stack cleaner is making a difference:
       add_test(mc-bugged1-liveness-stack-cleaner
         ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/bugged1_liveness_stack_cleaner
         ${CMAKE_HOME_DIRECTORY}/examples/msg/mc/
@@ -131,11 +131,6 @@ IF(NOT enable_memcheck)
   # END TESH TESTS
 
   ### SMPI ###
-  IF(enable_smpi)
-    # BEGIN TESH TESTS
-    # smpi examples
-    ADD_TESH_FACTORIES(tesh-smpi-compute         "thread;ucontext;raw;boost" --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/smpi/compute --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/compute compute.tesh)
-    # END TESH TESTS
     IF(enable_smpi_MPICH3_testsuite)
       IF(HAVE_THREAD_CONTEXTS)
         ADD_TEST(test-smpi-mpich3-coll-thread      ${CMAKE_COMMAND} -E chdir ${CMAKE_BINARY_DIR}/teshsuite/smpi/mpich3-test/coll ${PERL_EXECUTABLE} ${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/runtests -mpiexec=${CMAKE_BINARY_DIR}/smpi_script/bin/smpirun -srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/smpi/mpich3-test/coll -tests=testlist -execarg=--cfg=contexts/factory:thread -execarg=--cfg=smpi/privatize_global_variables:${HAVE_PRIVATIZATION})
@@ -174,24 +169,6 @@ IF(NOT enable_memcheck)
       ENDIF()
     ENDIF()
 
-    # BEGIN TESH TESTS
-    ADD_TESH_FACTORIES(smpi-energy               "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/energy --cd ${CMAKE_BINARY_DIR}/examples/smpi/energy ${CMAKE_HOME_DIRECTORY}/examples/smpi/energy/energy.tesh)
-    IF(SMPI_FORTRAN)
-      ADD_TESH_FACTORIES(smpi-energy-f77         "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/energy --cd ${CMAKE_BINARY_DIR}/examples/smpi/energy ${CMAKE_HOME_DIRECTORY}/examples/smpi/energy/f77/energy.tesh)
-      ADD_TESH_FACTORIES(smpi-energy-f90         "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/energy --cd ${CMAKE_BINARY_DIR}/examples/smpi/energy ${CMAKE_HOME_DIRECTORY}/examples/smpi/energy/f90/energy.tesh)
-    ENDIF()
-    ADD_TESH_FACTORIES(smpi-msg-masterslave      "thread;ucontext;raw;boost" --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave --cd ${CMAKE_BINARY_DIR}/examples/smpi/smpi_msg_masterslave ${CMAKE_HOME_DIRECTORY}/examples/smpi/smpi_msg_masterslave/msg_smpi.tesh)
-    IF(NOT HAVE_MC)
-      ADD_TESH(smpi-replay-multiple      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple --cd ${CMAKE_BINARY_DIR}/examples/smpi/replay_multiple ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay_multiple/replay_multiple.tesh)
-    ENDIF()
-    ADD_TESH(smpi-tracing-ptp                  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/tracing/smpi_traced.tesh)
-    ADD_TESH(smpi-replay-simple                --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi --cd ${CMAKE_BINARY_DIR}/examples/smpi ${CMAKE_HOME_DIRECTORY}/examples/smpi/replay/smpi_replay.tesh)
-    IF(HAVE_MC)
-      ADD_TESH(smpi-mc-only-send-determinism                  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/smpi/mc --cd ${CMAKE_BINARY_DIR}/examples/smpi/mc ${CMAKE_HOME_DIRECTORY}/examples/smpi/mc/only_send_deterministic.tesh)
-    ENDIF()
-    # END TESH TESTS
-  ENDIF()
-
   ## BINDINGS ##
   ### LUA ###
   IF(HAVE_LUA)