Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
authorFrederic Suter <frederic.suter@cc.in2p3.fr>
Wed, 2 Mar 2016 12:00:55 +0000 (13:00 +0100)
committerFrederic Suter <frederic.suter@cc.in2p3.fr>
Wed, 2 Mar 2016 12:00:55 +0000 (13:00 +0100)
48 files changed:
.gitignore
teshsuite/java/semaphore/CMakeLists.txt
teshsuite/java/sleep_host_off/CMakeLists.txt
teshsuite/msg/host_on_off/CMakeLists.txt
teshsuite/simdag/availability/CMakeLists.txt
teshsuite/simdag/basic/CMakeLists.txt
teshsuite/simdag/incomplete/CMakeLists.txt
teshsuite/simdag/network/mxn/CMakeLists.txt
teshsuite/simdag/network/mxn/mxn-all2all.c [moved from teshsuite/simdag/network/mxn/test_intra_all2all.c with 100% similarity]
teshsuite/simdag/network/mxn/mxn-all2all.tesh [new file with mode: 0644]
teshsuite/simdag/network/mxn/mxn-independent_comm.c [moved from teshsuite/simdag/network/mxn/test_intra_independent_comm.c with 100% similarity]
teshsuite/simdag/network/mxn/mxn-independent_comm.tesh [new file with mode: 0644]
teshsuite/simdag/network/mxn/mxn-scatter.c [moved from teshsuite/simdag/network/mxn/test_intra_scatter.c with 100% similarity]
teshsuite/simdag/network/mxn/mxn-scatter.tesh [new file with mode: 0644]
teshsuite/simdag/network/mxn/test_intra_all2all.tesh [deleted file]
teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh [deleted file]
teshsuite/simdag/network/mxn/test_intra_scatter.tesh [deleted file]
teshsuite/simdag/network/p2p/CMakeLists.txt
teshsuite/simdag/network/p2p/p2p-latency1.c [moved from teshsuite/simdag/network/p2p/test_latency1.c with 100% similarity]
teshsuite/simdag/network/p2p/p2p-latency1.tesh [new file with mode: 0644]
teshsuite/simdag/network/p2p/p2p-latency2.c [moved from teshsuite/simdag/network/p2p/test_latency2.c with 100% similarity]
teshsuite/simdag/network/p2p/p2p-latency2.tesh [new file with mode: 0644]
teshsuite/simdag/network/p2p/p2p-latency3.c [moved from teshsuite/simdag/network/p2p/test_latency3.c with 100% similarity]
teshsuite/simdag/network/p2p/p2p-latency3.tesh [new file with mode: 0644]
teshsuite/simdag/network/p2p/p2p-latency_bound.c [moved from teshsuite/simdag/network/p2p/test_latency_bound.c with 100% similarity]
teshsuite/simdag/network/p2p/p2p-latency_bound.tesh [new file with mode: 0644]
teshsuite/simdag/network/p2p/test_latency1.tesh [deleted file]
teshsuite/simdag/network/p2p/test_latency2.tesh [deleted file]
teshsuite/simdag/network/p2p/test_latency3.tesh [deleted file]
teshsuite/simdag/network/p2p/test_latency_bound.tesh [deleted file]
teshsuite/simdag/partask/CMakeLists.txt
teshsuite/simdag/partask/par-comp_only_par.c [moved from teshsuite/simdag/partask/test_comp_only_par.c with 100% similarity]
teshsuite/simdag/partask/par-comp_only_par.tesh [new file with mode: 0644]
teshsuite/simdag/partask/par-comp_only_seq.c [moved from teshsuite/simdag/partask/test_comp_only_seq.c with 100% similarity]
teshsuite/simdag/partask/par-comp_only_seq.tesh [new file with mode: 0644]
teshsuite/simdag/partask/test_comp_only_par.tesh [deleted file]
teshsuite/simdag/partask/test_comp_only_seq.tesh [deleted file]
teshsuite/simix/check_defaults/CMakeLists.txt
teshsuite/surf/lmm_usage/CMakeLists.txt
teshsuite/surf/maxmin_bench/CMakeLists.txt
teshsuite/surf/maxmin_bench/maxmin_bench_large.tesh
teshsuite/surf/maxmin_bench/maxmin_bench_medium.tesh
teshsuite/surf/maxmin_bench/maxmin_bench_small.tesh
teshsuite/surf/surf_usage/CMakeLists.txt
teshsuite/surf/surf_usage/surf_usage.tesh
teshsuite/surf/surf_usage/surf_usage2.tesh [new file with mode: 0644]
teshsuite/surf/trace_usage/CMakeLists.txt
tools/cmake/Tests.cmake

index dcd0017..533913d 100644 (file)
@@ -293,16 +293,16 @@ teshsuite/simdag/basic/basic4
 teshsuite/simdag/basic/basic5
 teshsuite/simdag/basic/basic6
 teshsuite/simdag/incomplete/incomplete
-teshsuite/simdag/network/mxn/test_intra_all2all
-teshsuite/simdag/network/mxn/test_intra_independent_comm
-teshsuite/simdag/network/mxn/test_intra_scatter
-teshsuite/simdag/network/p2p/test_latency1
-teshsuite/simdag/network/p2p/test_latency2
-teshsuite/simdag/network/p2p/test_latency3
-teshsuite/simdag/network/p2p/test_latency_bound
+teshsuite/simdag/network/mxn/mxn-all2all
+teshsuite/simdag/network/mxn/mxn-independent_comm
+teshsuite/simdag/network/mxn/mxn-scatter
+teshsuite/simdag/network/p2p/p2p-latency1
+teshsuite/simdag/network/p2p/p2p-latency2
+teshsuite/simdag/network/p2p/p2p-latency3
+teshsuite/simdag/network/p2p/p2p-latency_bound
 teshsuite/simdag/network/test_reinit_costs
-teshsuite/simdag/partask/test_comp_only_par
-teshsuite/simdag/partask/test_comp_only_seq
+teshsuite/simdag/partask/par-comp_only_par
+teshsuite/simdag/partask/par-comp_only_seq
 teshsuite/simdag/platforms/basic_link_test
 teshsuite/simdag/platforms/basic_parsing_test
 teshsuite/simdag/platforms/basic_tracing
index f910523..48c3197 100644 (file)
@@ -6,19 +6,14 @@ if(enable_java)
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
+
+  ADD_TESH(tesh-java-semaphore-gc --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java ${CMAKE_HOME_DIRECTORY}/teshsuite/java/semaphore/semaphore_gc.tesh)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/semaphore_gc.tesh
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/semaphore_gc.tesh PARENT_SCOPE)
+set(examples_src ${examples_src} ${sources}                                    PARENT_SCOPE)
index 289792f..daad89c 100644 (file)
@@ -6,23 +6,15 @@ if(enable_java)
     COMMENT "Building ${example}..."
     OUTPUT ${example}_compiled
     DEPENDS ${sources} simgrid-java_jar ${SIMGRID_JAR}
-    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR}
-                             -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
+    COMMAND ${JAVA_COMPILE} -classpath ${SIMGRID_JAR} -d ${CMAKE_CURRENT_BINARY_DIR}/.. ${sources}
     COMMAND ${CMAKE_COMMAND} -E remove ${example}_compiled
     COMMAND ${CMAKE_COMMAND} -E touch ${example}_compiled
   )
   add_custom_target(${example} ALL DEPENDS ${example}_compiled)
+
+  ADD_TESH(tesh-java-sleep-host-off --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java ${CMAKE_HOME_DIRECTORY}/teshsuite/java/sleep_host_off/sleep_host_off.tesh)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/sleep_host_off.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/sleep_host_off_d.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${sources}
-  PARENT_SCOPE)
+set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/sleep_host_off.tesh  PARENT_SCOPE)
+set(xml_files    ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/sleep_host_off_d.xml PARENT_SCOPE)
+set(examples_src ${examples_src} ${sources}                                       PARENT_SCOPE)
index 65ebe4f..542313e 100644 (file)
@@ -10,4 +10,4 @@ endforeach()
 
 set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/host_on_off_d.xml PARENT_SCOPE)
 set(teshsuite_src ${teshsuite_src}                                               PARENT_SCOPE)
-set(tesh_files    ${tesh_files}                                                  PARENT_SCOPE)
\ No newline at end of file
+set(tesh_files    ${tesh_files}                                                  PARENT_SCOPE)
index 798d88a..9a971d8 100644 (file)
@@ -1,11 +1,7 @@
 add_executable       (availability_test availability_test.c)
 target_link_libraries(availability_test simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/availability_test.tesh
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/availability_test.c
-  PARENT_SCOPE)
+set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/availability_test.tesh  PARENT_SCOPE)
+set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/availability_test.c     PARENT_SCOPE)
+
+ADD_TESH(tesh-simdag-availability --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/availability/availability_test.tesh)
index 2fd0417..2c4ce40 100644 (file)
@@ -1,35 +1,12 @@
-add_executable       (basic0 basic0.c)
-target_link_libraries(basic0 simgrid)
-add_executable       (basic1 basic1.c)
-target_link_libraries(basic1 simgrid)
-add_executable       (basic2 basic2.c)
-target_link_libraries(basic2 simgrid)
-add_executable       (basic3 basic3.c)
-target_link_libraries(basic3 simgrid)
-add_executable       (basic4 basic4.c)
-target_link_libraries(basic4 simgrid)
-add_executable       (basic5 basic5.c)
-target_link_libraries(basic5 simgrid)
-add_executable       (basic6 basic6.c)
-target_link_libraries(basic6 simgrid)
+foreach(x 0 1 2 3 4 5 6)
+  add_executable       (basic${x} basic${x}.c)
+  target_link_libraries(basic${x} simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic0.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic1.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic2.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic3.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic4.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic5.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic6.tesh
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic0.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic1.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic3.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic4.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic5.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/basic6.c
-  PARENT_SCOPE)
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/basic${x}.tesh)
+  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/basic${x}.c)
+
+  ADD_TESH(tesh-simdag-basic${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic${x}.tesh)
+endforeach()
+
+set(teshsuite_src ${teshsuite_src}                                               PARENT_SCOPE)
+set(tesh_files    ${tesh_files}                                                  PARENT_SCOPE)
index c742098..116b349 100644 (file)
@@ -1,11 +1,8 @@
 add_executable       (incomplete incomplete.c)
 target_link_libraries(incomplete simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/incomplete.tesh
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/incomplete.c
-  PARENT_SCOPE)
+set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/incomplete.tesh  PARENT_SCOPE)
+set(teshsuite_src  ${teshsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/incomplete.c     PARENT_SCOPE)
+
+ADD_TESH(tesh-simdag-incomplete --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/incomplete --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/incomplete incomplete.tesh)
+
index 2d536b6..4c78430 100644 (file)
@@ -1,23 +1,13 @@
-add_executable       (test_intra_all2all          test_intra_all2all.c)
-target_link_libraries(test_intra_all2all          simgrid)
-add_executable       (test_intra_independent_comm test_intra_independent_comm.c)
-target_link_libraries(test_intra_independent_comm simgrid)
-add_executable       (test_intra_scatter          test_intra_scatter.c)
-target_link_libraries(test_intra_scatter          simgrid)
+foreach(x mxn-all2all mxn-independent_comm mxn-scatter)
+  add_executable       (${x} ${x}.c)
+  target_link_libraries(${x} simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_all2all.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_independent_comm.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_scatter.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_4p_1switch.xml
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_all2all.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_independent_comm.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_intra_scatter.c
-  PARENT_SCOPE)
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh)
+  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c)
+
+  ADD_TESH(tesh-simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/${x}.tesh)
+endforeach()
+
+set(teshsuite_src ${teshsuite_src}                                                     PARENT_SCOPE)
+set(tesh_files    ${tesh_files}                                                        PARENT_SCOPE)
+set(xml_files     ${xml_files}    ${CMAKE_CURRENT_SOURCE_DIR}/platform_4p_1switch.xml  PARENT_SCOPE)
diff --git a/teshsuite/simdag/network/mxn/mxn-all2all.tesh b/teshsuite/simdag/network/mxn/mxn-all2all.tesh
new file mode 100644 (file)
index 0000000..11fe6e7
--- /dev/null
@@ -0,0 +1,7 @@
+
+p all 2 all test, only fat pipe switch is used concurrently
+! output sort
+
+$ simdag/network/mxn/mxn-all2all ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 8
diff --git a/teshsuite/simdag/network/mxn/mxn-independent_comm.tesh b/teshsuite/simdag/network/mxn/mxn-independent_comm.tesh
new file mode 100644 (file)
index 0000000..cc0b32a
--- /dev/null
@@ -0,0 +1,7 @@
+
+p sending on different paths test
+! output sort
+
+$ simdag/network/mxn/mxn-independent_comm ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 3
diff --git a/teshsuite/simdag/network/mxn/mxn-scatter.tesh b/teshsuite/simdag/network/mxn/mxn-scatter.tesh
new file mode 100644 (file)
index 0000000..b4e3389
--- /dev/null
@@ -0,0 +1,7 @@
+
+p scatter test
+! output sort
+
+$ simdag/network/mxn/mxn-scatter ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 8
diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh b/teshsuite/simdag/network/mxn/test_intra_all2all.tesh
deleted file mode 100644 (file)
index af092a1..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-p all 2 all test, only fat pipe switch is used concurrently
-! output sort
-
-$ simdag/network/mxn/test_intra_all2all ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 8
diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh b/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh
deleted file mode 100644 (file)
index 34920d3..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-p sending on different paths test
-! output sort
-
-$ simdag/network/mxn/test_intra_independent_comm ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 3
diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh b/teshsuite/simdag/network/mxn/test_intra_scatter.tesh
deleted file mode 100644 (file)
index 53c84c2..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-p scatter test
-! output sort
-
-$ simdag/network/mxn/test_intra_scatter ${srcdir:=.}/simdag/network/mxn/platform_4p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 8
index 931f2e0..7ff5266 100644 (file)
@@ -1,30 +1,16 @@
-add_executable       (test_latency1      test_latency1.c)
-target_link_libraries(test_latency1      simgrid)
-add_executable       (test_latency2      test_latency2.c)
-target_link_libraries(test_latency2      simgrid)
-add_executable       (test_latency3      test_latency3.c)
-target_link_libraries(test_latency3      simgrid)
-add_executable       (test_latency_bound test_latency_bound.c)
-target_link_libraries(test_latency_bound simgrid)
+foreach(x p2p-latency1 p2p-latency2 p2p-latency3 p2p-latency_bound)
+  add_executable       (${x} ${x}.c)
+  target_link_libraries(${x} simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency1.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency2.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency3.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency_bound.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1bb.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1fl.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1switch.xml
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency1.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency3.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_latency_bound.c
-  PARENT_SCOPE)
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh)
+  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c)
+
+  ADD_TESH(tesh-simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/${x}.tesh)
+endforeach()
+
+set(teshsuite_src ${teshsuite_src}                                                     PARENT_SCOPE)
+set(tesh_files    ${tesh_files}                                                        PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1bb.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1fl.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1switch.xml PARENT_SCOPE)
diff --git a/teshsuite/simdag/network/p2p/p2p-latency1.tesh b/teshsuite/simdag/network/p2p/p2p-latency1.tesh
new file mode 100644 (file)
index 0000000..3c84318
--- /dev/null
@@ -0,0 +1,21 @@
+
+p latency check, 1 byte, shared link
+! output sort
+
+$ simdag/network/p2p/p2p-latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 1.5
+
+p latency check, 1 byte, fat pipe
+! output sort
+
+$ simdag/network/p2p/p2p-latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 1.5
+
+p latency check, 1 byte, link - switch - link
+! output sort
+
+$ simdag/network/p2p/p2p-latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 3
diff --git a/teshsuite/simdag/network/p2p/p2p-latency2.tesh b/teshsuite/simdag/network/p2p/p2p-latency2.tesh
new file mode 100644 (file)
index 0000000..dffed7b
--- /dev/null
@@ -0,0 +1,21 @@
+
+p latency check, 2 x 1 byte, same direction, shared link
+! output sort
+
+$ simdag/network/p2p/p2p-latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 2.5
+
+p latency check, 2 x 1 byte, same direction, fat pipe
+! output sort
+
+$ simdag/network/p2p/p2p-latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 1.5
+
+p latency check, 2 x 1 byte, same direction, link - switch - link
+! output sort
+
+$ simdag/network/p2p/p2p-latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 4
diff --git a/teshsuite/simdag/network/p2p/p2p-latency3.tesh b/teshsuite/simdag/network/p2p/p2p-latency3.tesh
new file mode 100644 (file)
index 0000000..53b7e61
--- /dev/null
@@ -0,0 +1,21 @@
+
+p latency check, 2 x 1 byte, opposite direction, shared link
+! output sort
+
+$ simdag/network/p2p/p2p-latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 2.5
+
+p latency check, 2 x 1 byte, opposite direction, fat pipe
+! output sort
+
+$ simdag/network/p2p/p2p-latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 1.5
+
+p latency check, 2 x 1 byte, opposite direction, link - switch - link
+! output sort
+
+$ simdag/network/p2p/p2p-latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 4
diff --git a/teshsuite/simdag/network/p2p/p2p-latency_bound.tesh b/teshsuite/simdag/network/p2p/p2p-latency_bound.tesh
new file mode 100644 (file)
index 0000000..025ce11
--- /dev/null
@@ -0,0 +1,7 @@
+
+p latency bounded by large latency link
+! output sort
+
+$ simdag/network/p2p/p2p-latency_bound ${srcdir:=.}/simdag/network/p2p/platform_2p_1bb.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 10001.5
diff --git a/teshsuite/simdag/network/p2p/test_latency1.tesh b/teshsuite/simdag/network/p2p/test_latency1.tesh
deleted file mode 100644 (file)
index 98668ed..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-p latency check, 1 byte, shared link
-! output sort
-
-$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 1.5
-
-p latency check, 1 byte, fat pipe
-! output sort
-
-$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 1.5
-
-p latency check, 1 byte, link - switch - link
-! output sort
-
-$ simdag/network/p2p/test_latency1 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 3
diff --git a/teshsuite/simdag/network/p2p/test_latency2.tesh b/teshsuite/simdag/network/p2p/test_latency2.tesh
deleted file mode 100644 (file)
index c9d6646..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-p latency check, 2 x 1 byte, same direction, shared link
-! output sort
-
-$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 2.5
-
-p latency check, 2 x 1 byte, same direction, fat pipe
-! output sort
-
-$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 1.5
-
-p latency check, 2 x 1 byte, same direction, link - switch - link
-! output sort
-
-$ simdag/network/p2p/test_latency2 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 4
diff --git a/teshsuite/simdag/network/p2p/test_latency3.tesh b/teshsuite/simdag/network/p2p/test_latency3.tesh
deleted file mode 100644 (file)
index adce22c..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-
-p latency check, 2 x 1 byte, opposite direction, shared link
-! output sort
-
-$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 2.5
-
-p latency check, 2 x 1 byte, opposite direction, fat pipe
-! output sort
-
-$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1fl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 1.5
-
-p latency check, 2 x 1 byte, opposite direction, link - switch - link
-! output sort
-
-$ simdag/network/p2p/test_latency3 ${srcdir:=.}/simdag/network/p2p/platform_2p_1switch.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 4
diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.tesh b/teshsuite/simdag/network/p2p/test_latency_bound.tesh
deleted file mode 100644 (file)
index e743543..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-p latency bounded by large latency link
-! output sort
-
-$ simdag/network/p2p/test_latency_bound ${srcdir:=.}/simdag/network/p2p/platform_2p_1bb.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 10001.5
index bf3a960..3d7143d 100644 (file)
@@ -1,20 +1,14 @@
-add_executable       (test_comp_only_seq test_comp_only_seq.c)
-target_link_libraries(test_comp_only_seq simgrid)
-add_executable       (test_comp_only_par test_comp_only_par.c)
-target_link_libraries(test_comp_only_par simgrid)
+foreach(x par-comp_only_seq par-comp_only_par)
+  add_executable       (${x} ${x}.c)
+  target_link_libraries(${x} simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_comp_only_par.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_comp_only_seq.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl_hetero.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_comp_only_par.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_comp_only_seq.c
-  PARENT_SCOPE)
+  set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/${x}.tesh)
+  set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c)
+
+  ADD_TESH(tesh-simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask/${x}.tesh)
+endforeach()
+
+set(teshsuite_src ${teshsuite_src}                                                        PARENT_SCOPE)
+set(tesh_files    ${tesh_files}                                                           PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl_hetero.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/platform_2p_1sl.xml        PARENT_SCOPE)
diff --git a/teshsuite/simdag/partask/par-comp_only_par.tesh b/teshsuite/simdag/partask/par-comp_only_par.tesh
new file mode 100644 (file)
index 0000000..48fe9cd
--- /dev/null
@@ -0,0 +1,12 @@
+
+p par task comp only, no comm, homogeneous
+! output sort
+$ simdag/partask/par-comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 1
+
+p par task comp only, no comm, heterogeneous
+! output sort
+$ simdag/partask/par-comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl_hetero.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 1
diff --git a/teshsuite/simdag/partask/par-comp_only_seq.tesh b/teshsuite/simdag/partask/par-comp_only_seq.tesh
new file mode 100644 (file)
index 0000000..71dabe1
--- /dev/null
@@ -0,0 +1,7 @@
+
+p seq task comp only, no comm
+
+! output sort
+$ simdag/partask/par-comp_only_seq ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
+> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
+> 1
diff --git a/teshsuite/simdag/partask/test_comp_only_par.tesh b/teshsuite/simdag/partask/test_comp_only_par.tesh
deleted file mode 100644 (file)
index 720f847..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-p par task comp only, no comm, homogeneous
-! output sort
-$ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 1
-
-p par task comp only, no comm, heterogeneous
-! output sort
-$ simdag/partask/test_comp_only_par ${srcdir:=.}/simdag/partask/platform_2p_1sl_hetero.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 1
diff --git a/teshsuite/simdag/partask/test_comp_only_seq.tesh b/teshsuite/simdag/partask/test_comp_only_seq.tesh
deleted file mode 100644 (file)
index a4fe862..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-
-p seq task comp only, no comm
-
-! output sort
-$ simdag/partask/test_comp_only_seq ${srcdir:=.}/simdag/partask/platform_2p_1sl.xml --cfg=path:${srcdir} --log=sd_kernel.thres=warning "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
-> [  0.000000] (0:maestro@) Switching to the L07 model to handle parallel tasks.
-> 1
index 956573c..e1fbeed 100644 (file)
@@ -1,13 +1,7 @@
 add_executable       (check_defaults check_defaults.c)
 target_link_libraries(check_defaults simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/factory_raw.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/factory_thread.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/factory_ucontext.tesh
-  PARENT_SCOPE)
-set(teshsuite_src
-  ${teshsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/check_defaults.c
-  PARENT_SCOPE)
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/factory_raw.tesh
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/factory_thread.tesh
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/factory_ucontext.tesh    PARENT_SCOPE)
+set(teshsuite_src ${teshsuite_src} ${CMAKE_CURRENT_SOURCE_DIR}/check_defaults.c         PARENT_SCOPE)
index 78d0d16..092cf73 100644 (file)
@@ -1,11 +1,7 @@
 add_executable       (lmm_usage lmm_usage.c)
 target_link_libraries(lmm_usage simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/lmm_usage.tesh
-  PARENT_SCOPE)
-set(testsuite_src
-  ${testsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/lmm_usage.c
-  PARENT_SCOPE)
+set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/lmm_usage.tesh  PARENT_SCOPE)
+set(testsuite_src  ${testsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/lmm_usage.c     PARENT_SCOPE)
+
+ADD_TESH(tesh-surf-lmm --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/lmm_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/lmm_usage lmm_usage.tesh)
index ecb261a..80e7cb5 100644 (file)
@@ -1,13 +1,10 @@
 add_executable       (maxmin_bench maxmin_bench.c)
 target_link_libraries(maxmin_bench simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench_small.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench_medium.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench_large.tesh
-  PARENT_SCOPE)
-set(testsuite_src
-  ${testsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench.c
-  PARENT_SCOPE)
+foreach(x small medium large)
+  set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench_${x}.tesh)
+  ADD_TESH(tesh-surf-maxmin-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/maxmin_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench maxmin_bench_${x}.tesh)
+endforeach()
+
+set(tesh_files     ${tesh_files}                                                  PARENT_SCOPE)
+set(testsuite_src  ${testsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/maxmin_bench.c   PARENT_SCOPE)
index 002cb95..81cbc34 100644 (file)
@@ -2,7 +2,7 @@
 
 ! timeout 50
 ! expect return 0
-$ ./maxmin_bench big 1
+$ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench big 1
 > Starting 0: (807)
 > Starting to solve(812)
 > 1x One shot execution time for a total of 2000 constraints, 2000 variables with 96 active constraint each, concurrency in [32,288] and max concurrency share 2
index 940cb8e..432cd10 100644 (file)
@@ -2,7 +2,7 @@
 
 ! timeout 50
 ! expect return 0
-$ ./maxmin_bench medium 5 test
+$ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench medium 5 test
 > [0.000000]: [surf_maxmin/DEBUG] Setting selective_update_active flag to 1
 > [0.000000]: [surf_maxmin/DEBUG] Active constraints : 100
 > [0.000000]: [surf_maxmin/DEBUG] Constraint '98' usage: 13.060939 remaining: 3.166833 concurrency: 7<=8<=10
index 4865b94..cd7dc68 100644 (file)
@@ -2,7 +2,7 @@
 
 ! timeout 10
 ! expect return 0
-$ ./maxmin_bench small  10 test
+$ $SG_TEST_EXENV ${bindir:=.}/maxmin_bench small  10 test
 > [0.000000]: [surf_maxmin/DEBUG] Setting selective_update_active flag to 1
 > [0.000000]: [surf_maxmin/DEBUG] Active constraints : 10
 > [0.000000]: [surf_maxmin/DEBUG] Constraint '9' usage: 4.703796 remaining: 7.082917 concurrency: 2<=2<=-1
index 76f38b4..d1be069 100644 (file)
@@ -1,14 +1,13 @@
-add_executable       (surf_usage  surf_usage.cpp)
-target_link_libraries(surf_usage  simgrid)
-add_executable       (surf_usage2 surf_usage2.cpp)
-target_link_libraries(surf_usage2 simgrid )
-
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/surf_usage.tesh
-  PARENT_SCOPE)
-set(testsuite_src
-  ${testsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/surf_usage.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/surf_usage2.cpp
-  PARENT_SCOPE)
+foreach(x surf_usage surf_usage2)
+  add_executable       (${x} ${x}.cpp)
+  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}.cpp)
+
+  ADD_TESH(tesh-${x} --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/surf_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/surf_usage ${x}.tesh)
+endforeach()
+
+set(teshsuite_src ${teshsuite_src}                                               PARENT_SCOPE)
+set(tesh_files    ${tesh_files}                                                  PARENT_SCOPE)
+
index c51400e..430a1f6 100644 (file)
@@ -1,6 +1,6 @@
 #! ./tesh
 
-$ $SG_TEST_EXENV ${bindir:=.}/surf_usage ../../examples/platforms/two_hosts_platform_with_availability.xml
+$ $SG_TEST_EXENV ${bindir:=.}/surf_usage ${srcdir:=.}/../../../examples/platforms/two_hosts_platform_with_availability.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
 > [0.000000] [surf_test/INFO] actionA state: SURF_ACTION_RUNNING
@@ -30,32 +30,3 @@ $ $SG_TEST_EXENV ${bindir:=.}/surf_usage ../../examples/platforms/two_hosts_plat
 > [150.000000] [surf_test/INFO] Next Event : 150
 > [157.500000] [surf_test/INFO] Next Event : 157.5
 > [157.500000] [surf_test/INFO]    CPU Done action
-
-$ $SG_TEST_EXENV ${bindir:=.}/surf_usage2  ../../examples/platforms/two_hosts_platform_with_availability.xml
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
-> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
-> [0.000000] [surf_test/INFO] Next Event : 0
-> [0.000000] [surf_test/INFO]    * Done Action
-> [0.200000] [surf_test/INFO] Next Event : 0.2
-> [0.200015] [surf_test/INFO] Next Event : 0.200015
-> [0.200015] [surf_test/INFO]    * Done Action
-> [7.320000] [surf_test/INFO] Next Event : 7.32
-> [7.320000] [surf_test/INFO]    * Done Action
-> [10.000000] [surf_test/INFO] Next Event : 10
-> [20.000000] [surf_test/INFO] Next Event : 20
-> [30.000000] [surf_test/INFO] Next Event : 30
-> [40.000000] [surf_test/INFO] Next Event : 40
-> [50.000000] [surf_test/INFO] Next Event : 50
-> [60.000000] [surf_test/INFO] Next Event : 60
-> [70.000000] [surf_test/INFO] Next Event : 70
-> [80.000000] [surf_test/INFO] Next Event : 80
-> [90.000000] [surf_test/INFO] Next Event : 90
-> [100.000000] [surf_test/INFO] Next Event : 100
-> [110.000000] [surf_test/INFO] Next Event : 110
-> [120.000000] [surf_test/INFO] Next Event : 120
-> [130.000000] [surf_test/INFO] Next Event : 130
-> [140.000000] [surf_test/INFO] Next Event : 140
-> [150.000000] [surf_test/INFO] Next Event : 150
-> [157.500000] [surf_test/INFO] Next Event : 157.5
-> [157.500000] [surf_test/INFO]    * Done Action
-> [157.500000] [surf_test/INFO] Simulation Terminated
diff --git a/teshsuite/surf/surf_usage/surf_usage2.tesh b/teshsuite/surf/surf_usage/surf_usage2.tesh
new file mode 100644 (file)
index 0000000..ca0d60c
--- /dev/null
@@ -0,0 +1,30 @@
+#! ./tesh
+
+$ $SG_TEST_EXENV ${bindir:=.}/surf_usage2  ${srcdir:=.}/../../../examples/platforms/two_hosts_platform_with_availability.xml
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'CM02'
+> [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'Cas01'
+> [0.000000] [surf_test/INFO] Next Event : 0
+> [0.000000] [surf_test/INFO]    * Done Action
+> [0.200000] [surf_test/INFO] Next Event : 0.2
+> [0.200015] [surf_test/INFO] Next Event : 0.200015
+> [0.200015] [surf_test/INFO]    * Done Action
+> [7.320000] [surf_test/INFO] Next Event : 7.32
+> [7.320000] [surf_test/INFO]    * Done Action
+> [10.000000] [surf_test/INFO] Next Event : 10
+> [20.000000] [surf_test/INFO] Next Event : 20
+> [30.000000] [surf_test/INFO] Next Event : 30
+> [40.000000] [surf_test/INFO] Next Event : 40
+> [50.000000] [surf_test/INFO] Next Event : 50
+> [60.000000] [surf_test/INFO] Next Event : 60
+> [70.000000] [surf_test/INFO] Next Event : 70
+> [80.000000] [surf_test/INFO] Next Event : 80
+> [90.000000] [surf_test/INFO] Next Event : 90
+> [100.000000] [surf_test/INFO] Next Event : 100
+> [110.000000] [surf_test/INFO] Next Event : 110
+> [120.000000] [surf_test/INFO] Next Event : 120
+> [130.000000] [surf_test/INFO] Next Event : 130
+> [140.000000] [surf_test/INFO] Next Event : 140
+> [150.000000] [surf_test/INFO] Next Event : 150
+> [157.500000] [surf_test/INFO] Next Event : 157.5
+> [157.500000] [surf_test/INFO]    * Done Action
+> [157.500000] [surf_test/INFO] Simulation Terminated
index 1bf1224..12f3256 100644 (file)
@@ -1,11 +1,7 @@
 add_executable(trace_usage trace_usage.cpp)
 target_link_libraries(trace_usage simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace_usage.tesh
-  PARENT_SCOPE)
-set(testsuite_src
-  ${testsuite_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/trace_usage.cpp
-  PARENT_SCOPE)
+set(tesh_files     ${tesh_files}     ${CMAKE_CURRENT_SOURCE_DIR}/trace_usage.tesh  PARENT_SCOPE)
+set(testsuite_src  ${testsuite_src}  ${CMAKE_CURRENT_SOURCE_DIR}/trace_usage.cpp   PARENT_SCOPE)
+
+ADD_TESH(tesh-surf-trace --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/trace_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/ trace_usage/trace_usage.tesh)
index 0607a42..bf7cb3f 100644 (file)
@@ -153,18 +153,6 @@ IF(NOT enable_memcheck)
     ENDIF()
   ENDIF()
 
-
-  ### SURF ###
-  # BEGIN TESH TESTS
-  ADD_TESH(tesh-surf-lmm                         --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/lmm_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/lmm_usage lmm_usage.tesh)
-  ADD_TESH(tesh-surf-maxmin-small                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/maxmin_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench maxmin_bench_small.tesh)
-  ADD_TESH(tesh-surf-maxmin-debug                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/maxmin_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench maxmin_bench_medium.tesh)
-  ADD_TESH(tesh-surf-maxmin-large                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/maxmin_bench --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/maxmin_bench maxmin_bench_large.tesh)
-  ADD_TESH(tesh-surf-usage                       --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/surf_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/ surf_usage/surf_usage.tesh)
-  ADD_TESH(tesh-surf-trace                       --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/surf/trace_usage --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/surf/ trace_usage/trace_usage.tesh)
-  # END TESH TESTS
-
-
   ### XBT ###
   # BEGIN TESH TESTS
   ADD_TESH(tesh-xbt-log-large                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/xbt/log_large --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/xbt/log_large log_large_test.tesh)
@@ -294,24 +282,6 @@ IF(NOT enable_memcheck)
   ADD_TESH(tesh-simdag-parser                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test.tesh)
   ADD_TESH(tesh-simdag-parser-sym-full           --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms basic_parsing_test_sym_full.tesh)
   ADD_TESH(tesh-simdag-full-links                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms get_full_link.tesh)
-  ADD_TESH(tesh-simdag-basic0                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic0.tesh)
-  ADD_TESH(tesh-simdag-basic1                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic1.tesh)
-  ADD_TESH(tesh-simdag-basic2                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic2.tesh)
-  ADD_TESH(tesh-simdag-basic3                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic3.tesh)
-  ADD_TESH(tesh-simdag-basic4                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic4.tesh)
-  ADD_TESH(tesh-simdag-basic5                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic5.tesh)
-  ADD_TESH(tesh-simdag-basic6                    --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/basic --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/basic basic6.tesh)
-  ADD_TESH(tesh-simdag-incomplete                --setenv bindir=${CMAKE_BINARY_DIR}/teshsuite/simdag/incomplete --cd ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/incomplete incomplete.tesh)
-  ADD_TESH(tesh-simdag-p2p-1                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency1.tesh)
-  ADD_TESH(tesh-simdag-p2p-2                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency2.tesh)
-  ADD_TESH(tesh-simdag-p2p-3                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency3.tesh)
-  ADD_TESH(tesh-simdag-p2p-4                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/p2p/test_latency_bound.tesh)
-  ADD_TESH(tesh-simdag-mxn-1                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_all2all.tesh)
-  ADD_TESH(tesh-simdag-mxn-2                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh)
-  ADD_TESH(tesh-simdag-mxn-3                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/network/mxn/test_intra_scatter.tesh)
-  ADD_TESH(tesh-simdag-par-1                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask/test_comp_only_seq.tesh)
-  ADD_TESH(tesh-simdag-par-2                     --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/partask/test_comp_only_par.tesh)
-  ADD_TESH(tesh-simdag-availability              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite --cd ${CMAKE_BINARY_DIR}/teshsuite ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/availability/availability_test.tesh)
   ADD_TEST(tesh-simdag-full-links01                ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters.xml FULL_LINK)
   ADD_TEST(tesh-simdag-full-links02                ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/teshsuite/simdag/platforms/two_clusters_one_name.xml FULL_LINK)
   ADD_TEST(tesh-simdag-one-link-g5k                ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test ${CMAKE_HOME_DIRECTORY}/examples/platforms/g5k.xml ONE_LINK)
@@ -501,10 +471,6 @@ IF(NOT enable_memcheck)
     ADD_TESH(java-startKillTime                  --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/startKillTime/startKillTime.tesh)
     ADD_TESH(java-suspend                        --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/suspend/suspend.tesh)
     ADD_TESH(java-tracing                        --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/examples/java ${CMAKE_HOME_DIRECTORY}/examples/java/tracing/tracingPingPong.tesh)
-
-    # teshsuite ones
-    ADD_TESH(tesh-java-sleep-host-off            --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java ${CMAKE_HOME_DIRECTORY}/teshsuite/java/sleep_host_off/sleep_host_off.tesh)
-    ADD_TESH(tesh-java-semaphore-gc              --setenv srcdir=${CMAKE_HOME_DIRECTORY}/teshsuite/java --setenv classpath=${TESH_CLASSPATH} --cd ${CMAKE_BINARY_DIR}/teshsuite/java ${CMAKE_HOME_DIRECTORY}/teshsuite/java/semaphore/semaphore_gc.tesh)
   ENDIF()
 ENDIF()