Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid

diff --git a/.gitignore b/.gitignore
index b921ea6..c13014a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -232,7 +232,7 @@ examples/simdag/sd_seq_access
 examples/simdag/sd_test
 examples/simdag/sd_test2
 examples/simdag/sd_test_console
-examples/simdag/sd_typed_tasks_test
+examples/simdag/sd_typed_tasks
 examples/simdag/simdag_tracing
 examples/smpi/bcbench
 examples/smpi/energy/f77/sef

diff --git a/examples/simdag/CMakeLists.txt b/examples/simdag/CMakeLists.txt
index 126e7f5..1feedb5 100644 (file)
--- a/examples/simdag/CMakeLists.txt
+++ b/examples/simdag/CMakeLists.txt
@@ -1,35 +1,12 @@
-add_executable       (sd_test             sd_test.c)
-target_link_libraries(sd_test             simgrid)
-add_executable       (sd_test2            sd_test2.c)
-target_link_libraries(sd_test2            simgrid)
-add_executable       (sd_fail             sd_fail.c)
-target_link_libraries(sd_fail             simgrid)
-add_executable       (sd_avail            sd_avail.c)
-target_link_libraries(sd_avail            simgrid)
-add_executable       (sd_typed_tasks_test sd_typed_tasks_test.c)
-target_link_libraries(sd_typed_tasks_test simgrid)
-add_executable       (sd_comm_throttling  sd_comm_throttling.c)
-target_link_libraries(sd_comm_throttling  simgrid)
+foreach(x test test2 avail fail typed_tasks comm_throttling)
+  add_executable       (sd_${x}     sd_${x}.c)
+  target_link_libraries(sd_${x}     simgrid)
+  set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/sd_${x}.c)
+  set(tesh_files   ${tesh_files}   ${CMAKE_CURRENT_SOURCE_DIR}/sd_${x}.tesh)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag2.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_comm_throttling.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_typed_tasks.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_avail.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_fail.tesh
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/sd_avail.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sd_comm_throttling.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sd_fail.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sd_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sd_test2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/sd_typed_tasks_test.c
-  PARENT_SCOPE)
-set(bin_files
-  ${bin_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua
-  PARENT_SCOPE)
+  ADD_TESH(simdag-${x} --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/sd_${x}.tesh)
+endforeach()
+
+set(examples_src ${examples_src} PARENT_SCOPE)
+set(tesh_files   ${tesh_files}   PARENT_SCOPE)
+set(bin_files ${bin_files} ${CMAKE_CURRENT_SOURCE_DIR}/platform_script.lua PARENT_SCOPE)

diff --git a/examples/simdag/dax/CMakeLists.txt b/examples/simdag/dax/CMakeLists.txt
index bac344e..8578645 100644 (file)
--- a/examples/simdag/dax/CMakeLists.txt
+++ b/examples/simdag/dax/CMakeLists.txt
@@ -1,17 +1,11 @@
 add_executable       (dax_test dax_test.c)
 target_link_libraries(dax_test simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/simple_dax_with_cycle.tesh
-  ${CMAKE_CURRENT_SOURCE_DIR}/smalldax.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/simple_dax_with_cycle.xml
-  ${CMAKE_CURRENT_SOURCE_DIR}/smalldax.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/dax_test.c
-  PARENT_SCOPE)
+ADD_TESH(simdag-dax       --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/dax --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax smalldax.tesh)
+ADD_TESH(simdag-dax-cycle --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/dax --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax simple_dax_with_cycle.tesh)
+
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/simple_dax_with_cycle.tesh
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/smalldax.tesh                PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/simple_dax_with_cycle.xml
+                                   ${CMAKE_CURRENT_SOURCE_DIR}/smalldax.xml                 PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/dax_test.c                   PARENT_SCOPE)

diff --git a/examples/simdag/dax/simple_dax_with_cycle.tesh b/examples/simdag/dax/simple_dax_with_cycle.tesh
index 67216c9..3962062 100644 (file)
--- a/examples/simdag/dax/simple_dax_with_cycle.tesh
+++ b/examples/simdag/dax/simple_dax_with_cycle.tesh
@@ -2,7 +2,7 @@
 p Test the DAX loader with a DAX comprising a cycle.
 
 ! expect return 255
-$ $SG_TEST_EXENV ./dax_test --log=no_loc ${srcdir:=.}/../../platforms/2clusters.xml ${srcdir:=.}/simple_dax_with_cycle.xml
+$ $SG_TEST_EXENV ${bindir:=.}/dax_test --log=no_loc ${srcdir:=.}/../../platforms/2clusters.xml ./simple_dax_with_cycle.xml
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [0.000000] [sd_daxparse/WARNING] the task root is not marked
 > [0.000000] [sd_daxparse/WARNING] the task 1@task1 is in a cycle

diff --git a/examples/simdag/dot/CMakeLists.txt b/examples/simdag/dot/CMakeLists.txt
index 9e81450..c4fabb3 100644 (file)
--- a/examples/simdag/dot/CMakeLists.txt
+++ b/examples/simdag/dot/CMakeLists.txt
@@ -1,30 +1,17 @@
 if(HAVE_GRAPHVIZ)
-  add_executable       (dot_test     dot_test.c)
-  target_link_libraries(dot_test     simgrid)
-  add_executable       (ptg_test     ptg_test.c)
-  target_link_libraries(ptg_test     simgrid)
-  add_executable       (simulate_dot simulate_dot.c)
-  target_link_libraries(simulate_dot simgrid)
-  add_executable       (dot_test2    dot_test2.c)
-  target_link_libraries(dot_test2    simgrid)
+  foreach(x dot_test ptg_test simulate_dot dot_test2)
+    add_executable       (${x}     ${x}.c)
+    target_link_libraries(${x}     simgrid)
+    set(examples_src ${examples_src} ${CMAKE_CURRENT_SOURCE_DIR}/${x}.c)
+  endforeach()
+
+  ADD_TESH(simdag-dotload --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag/dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/test_simdag_dotload.tesh)
 endif()
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_dotload.tesh
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/dot_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/ptg_test.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/dot_test2.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/simulate_dot.c
-  PARENT_SCOPE)
-set(txt_files
-  ${txt_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/dag_with_bad_schedule.dot
-  ${CMAKE_CURRENT_SOURCE_DIR}/dag_with_cycle.dot
-  ${CMAKE_CURRENT_SOURCE_DIR}/dag_with_good_schedule.dot
-  ${CMAKE_CURRENT_SOURCE_DIR}/dag.dot
-  ${CMAKE_CURRENT_SOURCE_DIR}/ptg.dot
-  PARENT_SCOPE)
+set(examples_src ${examples_src}                                                          PARENT_SCOPE)
+set(tesh_files   ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/test_simdag_dotload.tesh    PARENT_SCOPE)
+set(txt_files    ${txt_files}     ${CMAKE_CURRENT_SOURCE_DIR}/dag_with_bad_schedule.dot
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/dag_with_cycle.dot
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/dag_with_good_schedule.dot
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/dag.dot
+                                  ${CMAKE_CURRENT_SOURCE_DIR}/ptg.dot                     PARENT_SCOPE)

diff --git a/examples/simdag/io/CMakeLists.txt b/examples/simdag/io/CMakeLists.txt
index f1e63b1..34c91a7 100644 (file)
--- a/examples/simdag/io/CMakeLists.txt
+++ b/examples/simdag/io/CMakeLists.txt
@@ -1,11 +1,7 @@
 add_executable       (sd_io sd_io.c)
 target_link_libraries(sd_io simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/io.tesh
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/sd_io.c
-  PARENT_SCOPE)
+ADD_TESH(simdag-io --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/simdag/io/io.tesh)
+
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/io.tesh  PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/sd_io.c  PARENT_SCOPE)

diff --git a/examples/simdag/properties/CMakeLists.txt b/examples/simdag/properties/CMakeLists.txt
index 892fff8..2ba1ca8 100644 (file)
--- a/examples/simdag/properties/CMakeLists.txt
+++ b/examples/simdag/properties/CMakeLists.txt
@@ -1,11 +1,7 @@
 add_executable       (sd_prop sd_prop.c)
 target_link_libraries(sd_prop simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_prop.tesh
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/sd_prop.c
-  PARENT_SCOPE)
+ADD_TESH(simdag-prop --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/properties/test_prop.tesh)
+
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/test_prop.tesh PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/sd_prop.c      PARENT_SCOPE)

diff --git a/examples/simdag/scheduling/CMakeLists.txt b/examples/simdag/scheduling/CMakeLists.txt
index 70d8da4..14929eb 100644 (file)
--- a/examples/simdag/scheduling/CMakeLists.txt
+++ b/examples/simdag/scheduling/CMakeLists.txt
@@ -1,15 +1,8 @@
 add_executable       (minmin_test minmin_test.c)
 target_link_libraries(minmin_test simgrid)
 
-set(tesh_files
-  ${tesh_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/test_minmin.tesh
-  PARENT_SCOPE)
-set(xml_files
-  ${xml_files}
-  ${CMAKE_CURRENT_SOURCE_DIR}/Montage_25.xml
-  PARENT_SCOPE)
-set(examples_src
-  ${examples_src}
-  ${CMAKE_CURRENT_SOURCE_DIR}/minmin_test.c
-  PARENT_SCOPE)
+ADD_TESH(simdag-minmin-scheduling --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/scheduling --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)
+
+set(tesh_files    ${tesh_files}    ${CMAKE_CURRENT_SOURCE_DIR}/test_minmin.tesh  PARENT_SCOPE)
+set(xml_files     ${xml_files}     ${CMAKE_CURRENT_SOURCE_DIR}/Montage_25.xml    PARENT_SCOPE)
+set(examples_src  ${examples_src}  ${CMAKE_CURRENT_SOURCE_DIR}/minmin_test.c     PARENT_SCOPE)

diff --git a/examples/simdag/test_simdag_avail.tesh b/examples/simdag/sd_avail.tesh
similarity index 100%
rename from examples/simdag/test_simdag_avail.tesh
rename to examples/simdag/sd_avail.tesh

diff --git a/examples/simdag/test_simdag_comm_throttling.tesh b/examples/simdag/sd_comm_throttling.tesh
similarity index 100%
rename from examples/simdag/test_simdag_comm_throttling.tesh
rename to examples/simdag/sd_comm_throttling.tesh

diff --git a/examples/simdag/test_simdag_fail.tesh b/examples/simdag/sd_fail.tesh
similarity index 100%
rename from examples/simdag/test_simdag_fail.tesh
rename to examples/simdag/sd_fail.tesh

diff --git a/examples/simdag/test_simdag.tesh b/examples/simdag/sd_test.tesh
similarity index 100%
rename from examples/simdag/test_simdag.tesh
rename to examples/simdag/sd_test.tesh

diff --git a/examples/simdag/test_simdag2.tesh b/examples/simdag/sd_test2.tesh
similarity index 100%
rename from examples/simdag/test_simdag2.tesh
rename to examples/simdag/sd_test2.tesh

diff --git a/examples/simdag/sd_typed_tasks_test.c b/examples/simdag/sd_typed_tasks.c
similarity index 100%
rename from examples/simdag/sd_typed_tasks_test.c
rename to examples/simdag/sd_typed_tasks.c

diff --git a/examples/simdag/test_simdag_typed_tasks.tesh b/examples/simdag/sd_typed_tasks.tesh
similarity index 85%
rename from examples/simdag/test_simdag_typed_tasks.tesh
rename to examples/simdag/sd_typed_tasks.tesh
index 1435468..0170338 100644 (file)
--- a/examples/simdag/test_simdag_typed_tasks.tesh
+++ b/examples/simdag/sd_typed_tasks.tesh
@@ -1,7 +1,7 @@
 #! ./tesh
 p Usage test of simdag's typed tasks
 
-$ $SG_TEST_EXENV ./sd_typed_tasks_test --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/../platforms/2clusters.xml
+$ $SG_TEST_EXENV ./sd_typed_tasks --cfg=network/TCP_gamma:4194304 ${srcdir:=.}/../platforms/2clusters.xml
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/TCP_gamma' to '4194304'
 > [0.000000] [xbt_cfg/INFO] Switching to the L07 model to handle parallel tasks.
 > [2.080300] [sd_typed_tasks_test/INFO] Task 'Seq. comp. 1' start time: 0.000000, finish time: 1.000000

diff --git a/tools/cmake/Tests.cmake b/tools/cmake/Tests.cmake
index ad40367..e6b3283 100644 (file)
--- a/tools/cmake/Tests.cmake
+++ b/tools/cmake/Tests.cmake
@@ -277,23 +277,6 @@ IF(NOT enable_memcheck)
   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)
   # END TESH TESTS
 
-  # BEGIN TESH TESTS
-  IF(HAVE_GRAPHVIZ)
-    ADD_TESH(simdag-dotload                    --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag/dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/test_simdag_dotload.tesh)
-  ENDIF()
-  ADD_TESH(simdag-simdag                         --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag.tesh)
-  ADD_TESH(simdag-simdag2                        --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag2.tesh)
-  ADD_TESH(simdag-typed-tasks                    --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_typed_tasks.tesh)
-  ADD_TESH(simdag-fail                         --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag_fail.tesh)
-  ADD_TESH(simdag-avail                          --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag test_simdag_avail.tesh)
-  ADD_TESH(simdag-comm-throttling                --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/test_simdag_comm_throttling.tesh)
-  ADD_TESH(simdag-dax                          --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/dax --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax smalldax.tesh)
-  ADD_TESH(simdag-dax-cycle                      --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag/dax --cd ${CMAKE_BINARY_DIR}/examples/simdag/dax ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax/simple_dax_with_cycle.tesh)
-  ADD_TESH(simdag-prop                           --setenv srcdir=${CMAKE_HOME_DIRECTORY}/examples/simdag --cd ${CMAKE_BINARY_DIR}/examples/simdag ${CMAKE_HOME_DIRECTORY}/examples/simdag/properties/test_prop.tesh)
-  ADD_TESH(simdag-minmin-scheduling              --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/scheduling --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling test_minmin.tesh)
-  ADD_TESH(simdag-io                             --setenv bindir=${CMAKE_BINARY_DIR}/examples/simdag/ --setenv srcdir=${CMAKE_HOME_DIRECTORY}/ --cd ${CMAKE_HOME_DIRECTORY}/examples/ ${CMAKE_HOME_DIRECTORY}/examples/simdag/io/io.tesh)
-  # END TESH TESTS
-
   ### SMPI ###
   IF(enable_smpi)
     # BEGIN TESH TESTS