memcheck_tests.cmake: update.

diff --git a/buildtools/Cmake/memcheck_tests.cmake b/buildtools/Cmake/memcheck_tests.cmake
index 566e941..892c474 100644 (file)
--- a/buildtools/Cmake/memcheck_tests.cmake
+++ b/buildtools/Cmake/memcheck_tests.cmake
@@ -441,14 +441,16 @@ ELSE(${ARCH_32_BITS})
 ENDIF(${ARCH_32_BITS})
 
 # simdag examples
 ENDIF(${ARCH_32_BITS})
 
 # simdag examples

-ADD_TEST(memcheck-simdag-test-dotload-0 ${CMAKE_BINARY_DIR}/examples/simdag/dot/dot_test ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/../2clusters.xml ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag.dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
-ADD_TEST(memcheck-simdag-test-dotload-1 cat ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag.trace --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
-ADD_TEST(memcheck-simdag-test-dotload-2 rm -f dag.trace --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
-ADD_TEST(memcheck-simdag-test-dotload-3 ${CMAKE_BINARY_DIR}/examples/simdag/dot/simulate_dot --log=no_loc  "--log=sd_dotparse.thres:verbose" ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/../2clusters.xml ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag_with_bad_schedule.dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
-ADD_TEST(memcheck-simdag-test-dotload-4 ${CMAKE_BINARY_DIR}/examples/simdag/dot/simulate_dot --log=no_loc ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/../2clusters.xml ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag_with_good_schedule.dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
-ADD_TEST(memcheck-simdag-test-dotload-5 cat ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag_with_good_schedule.trace --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
-ADD_TEST(memcheck-simdag-test-dotload-6 rm -f ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag_with_good_schedule.trace --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
-ADD_TEST(memcheck-simdag-test-dotload-7 ${CMAKE_BINARY_DIR}/examples/simdag/dot/dot_test --log=no_loc ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/../2clusters.xml ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag_with_cycle.dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
+if(HAVE_GRAPHVIZ)
+  ADD_TEST(memcheck-simdag-test-dotload-0 ${CMAKE_BINARY_DIR}/examples/simdag/dot/dot_test ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/../2clusters.xml ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag.dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
+  ADD_TEST(memcheck-simdag-test-dotload-1 cat ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag.trace --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
+  ADD_TEST(memcheck-simdag-test-dotload-2 rm -f dag.trace --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
+  ADD_TEST(memcheck-simdag-test-dotload-3 ${CMAKE_BINARY_DIR}/examples/simdag/dot/simulate_dot --log=no_loc  "--log=sd_dotparse.thres:verbose" ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/../2clusters.xml ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag_with_bad_schedule.dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
+  ADD_TEST(memcheck-simdag-test-dotload-4 ${CMAKE_BINARY_DIR}/examples/simdag/dot/simulate_dot --log=no_loc ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/../2clusters.xml ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag_with_good_schedule.dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
+  ADD_TEST(memcheck-simdag-test-dotload-5 cat ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag_with_good_schedule.trace --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
+  ADD_TEST(memcheck-simdag-test-dotload-6 rm -f ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag_with_good_schedule.trace --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
+  ADD_TEST(memcheck-simdag-test-dotload-7 ${CMAKE_BINARY_DIR}/examples/simdag/dot/dot_test --log=no_loc ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/../2clusters.xml ${CMAKE_HOME_DIRECTORY}/examples/simdag/dot/dag_with_cycle.dot --cd ${CMAKE_BINARY_DIR}/examples/simdag/dot/)
+endif(HAVE_GRAPHVIZ)

 ADD_TEST(memcheck-simdag-test-simdag-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_test ${CMAKE_HOME_DIRECTORY}/examples/simdag/../msg/msg_platform.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
 ADD_TEST(memcheck-simdag-test-simdag2-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_test2 ${CMAKE_HOME_DIRECTORY}/examples/simdag/2clusters.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
 ADD_TEST(memcheck-simdag-test-seq-access-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_seq_access ${CMAKE_HOME_DIRECTORY}/examples/simdag/2clusters.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
 ADD_TEST(memcheck-simdag-test-simdag-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_test ${CMAKE_HOME_DIRECTORY}/examples/simdag/../msg/msg_platform.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
 ADD_TEST(memcheck-simdag-test-simdag2-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_test2 ${CMAKE_HOME_DIRECTORY}/examples/simdag/2clusters.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
 ADD_TEST(memcheck-simdag-test-seq-access-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_seq_access ${CMAKE_HOME_DIRECTORY}/examples/simdag/2clusters.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)


@@ -526,6 +528,9 @@ IF(HAVE_TRACING)
   ADD_TEST(memcheck-tracing-ms-3 cat tracing/ms.uncat.plist --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   ADD_TEST(memcheck-tracing-ms-4 cat tracing/ms.cat.plist --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   ADD_TEST(memcheck-tracing-ms-5 rm -rf tracing/ms.trace tracing/ms.cat.plist tracing/ms.uncat.plist --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   ADD_TEST(memcheck-tracing-ms-3 cat tracing/ms.uncat.plist --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   ADD_TEST(memcheck-tracing-ms-4 cat tracing/ms.cat.plist --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   ADD_TEST(memcheck-tracing-ms-5 rm -rf tracing/ms.trace tracing/ms.cat.plist tracing/ms.uncat.plist --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)

+  ADD_TEST(memcheck-tracing-simdag-0 ${CMAKE_BINARY_DIR}/examples/simdag/simdag_tracing --cfg=tracing:1 --cfg=tracing/categorized:1 ${CMAKE_HOME_DIRECTORY}/examples/simdag/2clusters.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
+  ADD_TEST(memcheck-tracing-simdag-1 cat ./simgrid.trace --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
+  ADD_TEST(memcheck-tracing-simdag-2 rm -f simgrid.trace --cd ${CMAKE_BINARY_DIR}/examples/simdag/)

   ADD_TEST(memcheck-tracing-trace_platform-0 ${CMAKE_BINARY_DIR}/examples/msg/tracing/trace_platform --cfg=tracing:1 --cfg=tracing/categorized:1 ./tracing/platform.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   ADD_TEST(memcheck-tracing-trace_platform-1 cat simgrid.trace --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   ADD_TEST(memcheck-tracing-trace_platform-2 ${CMAKE_BINARY_DIR}/examples/msg/tracing/trace_platform --cfg=tracing:1 --cfg=tracing/categorized:1 ./../platforms/g5k.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   ADD_TEST(memcheck-tracing-trace_platform-0 ${CMAKE_BINARY_DIR}/examples/msg/tracing/trace_platform --cfg=tracing:1 --cfg=tracing/categorized:1 ./tracing/platform.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   ADD_TEST(memcheck-tracing-trace_platform-1 cat simgrid.trace --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   ADD_TEST(memcheck-tracing-trace_platform-2 ${CMAKE_BINARY_DIR}/examples/msg/tracing/trace_platform --cfg=tracing:1 --cfg=tracing/categorized:1 ./../platforms/g5k.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)


@@ -561,7 +566,7 @@ if(HAVE_LUA)
   ADD_TEST(memcheck-lua-masterslave-bypass-0 lua master_slave_bypass.lua --log=surf_parse.thres:critical --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/console/)
   ADD_TEST(memcheck-lua-msg-masterslave-console-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_console ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/platform_script.lua --log=surf_parse.thres:critical "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_BINARY_DIR}/examples/msg/masterslave/)
   ADD_TEST(memcheck-lua-chord-0 lua chord.lua ../../msg/msg_platform.xml ../../msg/chord/chord.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/chord/)
   ADD_TEST(memcheck-lua-masterslave-bypass-0 lua master_slave_bypass.lua --log=surf_parse.thres:critical --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/console/)
   ADD_TEST(memcheck-lua-msg-masterslave-console-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_console ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/platform_script.lua --log=surf_parse.thres:critical "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_BINARY_DIR}/examples/msg/masterslave/)
   ADD_TEST(memcheck-lua-chord-0 lua chord.lua ../../msg/msg_platform.xml ../../msg/chord/chord.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/chord/)

-  ADD_TEST(memcheck-simdag-test-lua-0 ${CMAKE_HOME_DIRECTORY}/examples/simdag/sd_test2 ..lua/console/platform.lua --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/)
+  ADD_TEST(memcheck-simdag-test-lua-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_test2 ${CMAKE_HOME_DIRECTORY}/examples/simdag/../lua/console/platform.lua --cd ${CMAKE_BINARY_DIR}/examples/simdag/)

   set_tests_properties(memcheck-lua-duplicated-globals-0         PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
   set_tests_properties(memcheck-lua-masterslave-0                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
   set_tests_properties(memcheck-lua-mult-matrix-0                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
   set_tests_properties(memcheck-lua-duplicated-globals-0         PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
   set_tests_properties(memcheck-lua-masterslave-0                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
   set_tests_properties(memcheck-lua-mult-matrix-0                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")