improve a bunch of CMake files

also improve matching between test name and file name

diff --git a/teshsuite/java/semaphore/CMakeLists.txt b/teshsuite/java/semaphore/CMakeLists.txt
index f910523..48c3197 100644 (file)
--- a/teshsuite/java/semaphore/CMakeLists.txt
+++ b/teshsuite/java/semaphore/CMakeLists.txt
@@ -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)

diff --git a/teshsuite/java/sleep_host_off/CMakeLists.txt b/teshsuite/java/sleep_host_off/CMakeLists.txt
index 289792f..daad89c 100644 (file)
--- a/teshsuite/java/sleep_host_off/CMakeLists.txt
+++ b/teshsuite/java/sleep_host_off/CMakeLists.txt
@@ -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)

diff --git a/teshsuite/msg/host_on_off/CMakeLists.txt b/teshsuite/msg/host_on_off/CMakeLists.txt
index 65ebe4f..542313e 100644 (file)
--- a/teshsuite/msg/host_on_off/CMakeLists.txt
+++ b/teshsuite/msg/host_on_off/CMakeLists.txt
@@ -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)

diff --git a/teshsuite/simdag/availability/CMakeLists.txt b/teshsuite/simdag/availability/CMakeLists.txt
index 798d88a..9a971d8 100644 (file)
--- a/teshsuite/simdag/availability/CMakeLists.txt
+++ b/teshsuite/simdag/availability/CMakeLists.txt
@@ -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)

diff --git a/teshsuite/simdag/basic/CMakeLists.txt b/teshsuite/simdag/basic/CMakeLists.txt
index 2fd0417..2c4ce40 100644 (file)
--- a/teshsuite/simdag/basic/CMakeLists.txt
+++ b/teshsuite/simdag/basic/CMakeLists.txt
@@ -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)

diff --git a/teshsuite/simdag/incomplete/CMakeLists.txt b/teshsuite/simdag/incomplete/CMakeLists.txt
index c742098..116b349 100644 (file)
--- a/teshsuite/simdag/incomplete/CMakeLists.txt
+++ b/teshsuite/simdag/incomplete/CMakeLists.txt
@@ -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)
+

diff --git a/teshsuite/simdag/network/mxn/CMakeLists.txt b/teshsuite/simdag/network/mxn/CMakeLists.txt
index 2d536b6..4c78430 100644 (file)
--- a/teshsuite/simdag/network/mxn/CMakeLists.txt
+++ b/teshsuite/simdag/network/mxn/CMakeLists.txt
@@ -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/test_intra_all2all.c b/teshsuite/simdag/network/mxn/mxn-all2all.c
similarity index 100%
rename from teshsuite/simdag/network/mxn/test_intra_all2all.c
rename to teshsuite/simdag/network/mxn/mxn-all2all.c

diff --git a/teshsuite/simdag/network/mxn/test_intra_all2all.tesh b/teshsuite/simdag/network/mxn/mxn-all2all.tesh
similarity index 100%
rename from teshsuite/simdag/network/mxn/test_intra_all2all.tesh
rename to teshsuite/simdag/network/mxn/mxn-all2all.tesh

diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.c b/teshsuite/simdag/network/mxn/mxn-independent_comm.c
similarity index 100%
rename from teshsuite/simdag/network/mxn/test_intra_independent_comm.c
rename to teshsuite/simdag/network/mxn/mxn-independent_comm.c

diff --git a/teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh b/teshsuite/simdag/network/mxn/mxn-independent_comm.tesh
similarity index 100%
rename from teshsuite/simdag/network/mxn/test_intra_independent_comm.tesh
rename to teshsuite/simdag/network/mxn/mxn-independent_comm.tesh

diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.c b/teshsuite/simdag/network/mxn/mxn-scatter.c
similarity index 100%
rename from teshsuite/simdag/network/mxn/test_intra_scatter.c
rename to teshsuite/simdag/network/mxn/mxn-scatter.c

diff --git a/teshsuite/simdag/network/mxn/test_intra_scatter.tesh b/teshsuite/simdag/network/mxn/mxn-scatter.tesh
similarity index 100%
rename from teshsuite/simdag/network/mxn/test_intra_scatter.tesh
rename to teshsuite/simdag/network/mxn/mxn-scatter.tesh

diff --git a/teshsuite/simdag/network/p2p/CMakeLists.txt b/teshsuite/simdag/network/p2p/CMakeLists.txt
index 931f2e0..7ff5266 100644 (file)
--- a/teshsuite/simdag/network/p2p/CMakeLists.txt
+++ b/teshsuite/simdag/network/p2p/CMakeLists.txt
@@ -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/test_latency1.c b/teshsuite/simdag/network/p2p/p2p-latency1.c
similarity index 100%
rename from teshsuite/simdag/network/p2p/test_latency1.c
rename to teshsuite/simdag/network/p2p/p2p-latency1.c

diff --git a/teshsuite/simdag/network/p2p/test_latency1.tesh b/teshsuite/simdag/network/p2p/p2p-latency1.tesh
similarity index 100%
rename from teshsuite/simdag/network/p2p/test_latency1.tesh
rename to teshsuite/simdag/network/p2p/p2p-latency1.tesh

diff --git a/teshsuite/simdag/network/p2p/test_latency2.c b/teshsuite/simdag/network/p2p/p2p-latency2.c
similarity index 100%
rename from teshsuite/simdag/network/p2p/test_latency2.c
rename to teshsuite/simdag/network/p2p/p2p-latency2.c

diff --git a/teshsuite/simdag/network/p2p/test_latency2.tesh b/teshsuite/simdag/network/p2p/p2p-latency2.tesh
similarity index 100%
rename from teshsuite/simdag/network/p2p/test_latency2.tesh
rename to teshsuite/simdag/network/p2p/p2p-latency2.tesh

diff --git a/teshsuite/simdag/network/p2p/test_latency3.c b/teshsuite/simdag/network/p2p/p2p-latency3.c
similarity index 100%
rename from teshsuite/simdag/network/p2p/test_latency3.c
rename to teshsuite/simdag/network/p2p/p2p-latency3.c

diff --git a/teshsuite/simdag/network/p2p/test_latency3.tesh b/teshsuite/simdag/network/p2p/p2p-latency3.tesh
similarity index 100%
rename from teshsuite/simdag/network/p2p/test_latency3.tesh
rename to teshsuite/simdag/network/p2p/p2p-latency3.tesh

diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.c b/teshsuite/simdag/network/p2p/p2p-latency_bound.c
similarity index 100%
rename from teshsuite/simdag/network/p2p/test_latency_bound.c
rename to teshsuite/simdag/network/p2p/p2p-latency_bound.c

diff --git a/teshsuite/simdag/network/p2p/test_latency_bound.tesh b/teshsuite/simdag/network/p2p/p2p-latency_bound.tesh
similarity index 100%
rename from teshsuite/simdag/network/p2p/test_latency_bound.tesh
rename to teshsuite/simdag/network/p2p/p2p-latency_bound.tesh

diff --git a/teshsuite/simdag/partask/CMakeLists.txt b/teshsuite/simdag/partask/CMakeLists.txt
index bf3a960..3d7143d 100644 (file)
--- a/teshsuite/simdag/partask/CMakeLists.txt
+++ b/teshsuite/simdag/partask/CMakeLists.txt
@@ -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/test_comp_only_par.c b/teshsuite/simdag/partask/par-comp_only_par.c
similarity index 100%
rename from teshsuite/simdag/partask/test_comp_only_par.c
rename to teshsuite/simdag/partask/par-comp_only_par.c

diff --git a/teshsuite/simdag/partask/test_comp_only_par.tesh b/teshsuite/simdag/partask/par-comp_only_par.tesh
similarity index 100%
rename from teshsuite/simdag/partask/test_comp_only_par.tesh
rename to teshsuite/simdag/partask/par-comp_only_par.tesh

diff --git a/teshsuite/simdag/partask/test_comp_only_seq.c b/teshsuite/simdag/partask/par-comp_only_seq.c
similarity index 100%
rename from teshsuite/simdag/partask/test_comp_only_seq.c
rename to teshsuite/simdag/partask/par-comp_only_seq.c

diff --git a/teshsuite/simdag/partask/test_comp_only_seq.tesh b/teshsuite/simdag/partask/par-comp_only_seq.tesh
similarity index 100%
rename from teshsuite/simdag/partask/test_comp_only_seq.tesh
rename to teshsuite/simdag/partask/par-comp_only_seq.tesh

diff --git a/teshsuite/simix/check_defaults/CMakeLists.txt b/teshsuite/simix/check_defaults/CMakeLists.txt
index 956573c..e1fbeed 100644 (file)
--- a/teshsuite/simix/check_defaults/CMakeLists.txt
+++ b/teshsuite/simix/check_defaults/CMakeLists.txt
@@ -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)

diff --git a/teshsuite/surf/lmm_usage/CMakeLists.txt b/teshsuite/surf/lmm_usage/CMakeLists.txt
index 78d0d16..092cf73 100644 (file)
--- a/teshsuite/surf/lmm_usage/CMakeLists.txt
+++ b/teshsuite/surf/lmm_usage/CMakeLists.txt
@@ -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)

diff --git a/teshsuite/surf/maxmin_bench/CMakeLists.txt b/teshsuite/surf/maxmin_bench/CMakeLists.txt
index ecb261a..1c1b317 100644 (file)
--- a/teshsuite/surf/maxmin_bench/CMakeLists.txt
+++ b/teshsuite/surf/maxmin_bench/CMakeLists.txt
@@ -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 debug 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)

diff --git a/teshsuite/surf/surf_usage/CMakeLists.txt b/teshsuite/surf/surf_usage/CMakeLists.txt
index 76f38b4..ad38e58 100644 (file)
--- a/teshsuite/surf/surf_usage/CMakeLists.txt
+++ b/teshsuite/surf/surf_usage/CMakeLists.txt
@@ -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)
+

diff --git a/teshsuite/surf/surf_usage/surf_usage.tesh b/teshsuite/surf/surf_usage/surf_usage.tesh
index c51400e..20dabc7 100644 (file)
--- a/teshsuite/surf/surf_usage/surf_usage.tesh
+++ b/teshsuite/surf/surf_usage/surf_usage.tesh
@@ -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..44e3d85
--- /dev/null
+++ b/teshsuite/surf/surf_usage/surf_usage2.tesh
@@ -0,0 +1,30 @@
+#! ./tesh
+
+$ $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/trace_usage/CMakeLists.txt b/teshsuite/surf/trace_usage/CMakeLists.txt
index 1bf1224..12f3256 100644 (file)
--- a/teshsuite/surf/trace_usage/CMakeLists.txt
+++ b/teshsuite/surf/trace_usage/CMakeLists.txt
@@ -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)

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index 0607a42..bf7cb3f 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -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()