Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Use binary dir for bindir, and cd to home dir.
[simgrid.git] / buildtools / Cmake / memcheck_tests.cmake
index 566e941..901fdc9 100644 (file)
@@ -134,6 +134,7 @@ ADD_TEST(memcheck-tesh-simdag-par-2-1 ${CMAKE_BINARY_DIR}/teshsuite/simdag/parta
 
 # MSG examples
 ADD_TEST(memcheck-msg-file-0 ${CMAKE_BINARY_DIR}/examples/msg//io/file ${CMAKE_HOME_DIRECTORY}//examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/examples//)
+ADD_TEST(memcheck-msg-file-1 ${CMAKE_BINARY_DIR}/examples/msg//io/file_unlink ${CMAKE_HOME_DIRECTORY}//examples/platforms/storage.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/examples//)
 ADD_TEST(memcheck-msg-start-kill-time-0 ${CMAKE_BINARY_DIR}/examples/msg//start_kill_time/sk_time ${CMAKE_HOME_DIRECTORY}//examples/platforms/cluster.xml ${CMAKE_HOME_DIRECTORY}//examples/msg/start_kill_time/deployment.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/examples//)
 ADD_TEST(memcheck-msg-start-kill-time-1 ${CMAKE_BINARY_DIR}/examples/msg//start_kill_time/sk_time ${CMAKE_HOME_DIRECTORY}//examples/platforms/cluster.xml ${CMAKE_HOME_DIRECTORY}//examples/msg/start_kill_time/deployment_start.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/examples//)
 ADD_TEST(memcheck-msg-start-kill-time-2 ${CMAKE_BINARY_DIR}/examples/msg//start_kill_time/sk_time ${CMAKE_HOME_DIRECTORY}//examples/platforms/cluster.xml ${CMAKE_HOME_DIRECTORY}//examples/msg/start_kill_time/deployment_kill.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_HOME_DIRECTORY}/examples//)
@@ -210,17 +211,20 @@ if(HAVE_RAWCTX)
 endif(HAVE_RAWCTX)
 
 ADD_TEST(memcheck-msg-masterslave-vivaldi-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_mailbox  ${CMAKE_HOME_DIRECTORY}/examples/msg/../platforms/vivaldi.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/deployment_masterslave_vivaldi.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0 --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
-ADD_TEST(memcheck-msg-token-ring-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
-ADD_TEST(memcheck-msg-token-ring-thread-1 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
+ADD_TEST(memcheck-msg-token-ring-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/platforms/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
+ADD_TEST(memcheck-msg-token-ring-thread-1 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/platforms/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
+ADD_TEST(memcheck-msg-token-ring-thread-2 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/platforms/meta_cluster.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
 if(HAVE_RAWCTX)
   ADD_TEST(memcheck-msg-masterslave-vivaldi-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_mailbox  ${CMAKE_HOME_DIRECTORY}/examples/msg/../platforms/vivaldi.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/deployment_masterslave_vivaldi.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0 --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
-  ADD_TEST(memcheck-msg-token-ring-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
-  ADD_TEST(memcheck-msg-token-ring-raw-1 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
+  ADD_TEST(memcheck-msg-token-ring-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/platforms/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
+  ADD_TEST(memcheck-msg-token-ring-raw-1 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/platforms/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
+  ADD_TEST(memcheck-msg-token-ring-raw-2 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/platforms/meta_cluster.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
 endif(HAVE_RAWCTX)
 if(CONTEXT_UCONTEXT)
   ADD_TEST(memcheck-msg-masterslave-vivaldi-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_mailbox  ${CMAKE_HOME_DIRECTORY}/examples/msg/../platforms/vivaldi.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/deployment_masterslave_vivaldi.xml --cfg=network/latency_factor:1.0 --cfg=network/bandwidth_factor:1.0 --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
-  ADD_TEST(memcheck-msg-token-ring-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/two_clusters.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
-  ADD_TEST(memcheck-msg-token-ring-ucontext-1 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/msg/token_ring/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
+  ADD_TEST(memcheck-msg-token-ring-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/platforms/routing_cluster.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
+  ADD_TEST(memcheck-msg-token-ring-ucontext-1 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/platforms/two_peers.xml --cfg=network/coordinates:yes "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
+  ADD_TEST(memcheck-msg-token-ring-ucontext-2 ${CMAKE_BINARY_DIR}/examples/msg/token_ring/token_ring ${CMAKE_HOME_DIRECTORY}/examples/platforms/meta_cluster.xml --log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/token_ring/)
 endif(CONTEXT_UCONTEXT)
 
 ADD_TEST(memcheck-msg-migration-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/migration/migration ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.deploy  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -258,6 +262,11 @@ ADD_TEST(memcheck-msg-chord-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chor
 ADD_TEST(memcheck-msg-chord-thread-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/factory:thread  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
 ADD_TEST(memcheck-msg-chord-thread-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord -nb_bits=6 ./../msg_platform.xml ./chord.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/nthreads:4 --cfg=contexts/factory:thread  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
 ADD_TEST(memcheck-msg-chord-thread-parallel-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/nthreads:4 --cfg=contexts/factory:thread  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
+ADD_TEST(memcheck-msg-bittorrent-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/)
+ADD_TEST(memcheck-msg-bittorrent-thread-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread --cfg=contexts/nthreads:4  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/)
+ADD_TEST(memcheck-msg-kademlia-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/kademlia/kademlia ./../msg_platform.xml ./kademlia.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia/)
+ADD_TEST(memcheck-msg-kademlia-thread-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/kademlia/kademlia ./../msg_platform.xml ./kademlia.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" --cfg=contexts/factory:thread --cfg=contexts/nthreads:4  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia/)
+
 if(CONTEXT_UCONTEXT)
   ADD_TEST(memcheck-msg-migration-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/migration/migration ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.deploy  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
   ADD_TEST(memcheck-msg-ptask-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/parallel_task/parallel_task ${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -294,6 +303,11 @@ if(CONTEXT_UCONTEXT)
   ADD_TEST(memcheck-msg-chord-ucontext-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
   ADD_TEST(memcheck-msg-chord-ucontext-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord -nb_bits=6 ./../msg_platform.xml ./chord.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/nthreads:4 --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
   ADD_TEST(memcheck-msg-chord-ucontext-parallel-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/nthreads:4 --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
+  ADD_TEST(memcheck-msg-bittorrent-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/)
+  ADD_TEST(memcheck-msg-bittorrent-ucontext-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/nthreads:4  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/)
+  ADD_TEST(memcheck-msg-kademlia-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/kademlia/kademlia ./../msg_platform.xml ./kademlia.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia/)
+  ADD_TEST(memcheck-msg-kademlia-ucontext-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/kademlia/kademlia ./../msg_platform.xml ./kademlia.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/nthreads:4  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia/)
+
 endif(CONTEXT_UCONTEXT)
 if(HAVE_RAWCTX)
   ADD_TEST(memcheck-msg-migration-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/migration/migration ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.deploy  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -331,6 +345,10 @@ if(HAVE_RAWCTX)
   ADD_TEST(memcheck-msg-chord-raw-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/factory:raw  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
   ADD_TEST(memcheck-msg-chord-raw-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord -nb_bits=6 ./../msg_platform.xml ./chord.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/nthreads:4 --cfg=contexts/factory:raw  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
   ADD_TEST(memcheck-msg-chord-raw-parallel-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/nthreads:4 --cfg=contexts/factory:raw  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/)
+  ADD_TEST(memcheck-msg-bittorrent-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/)
+  ADD_TEST(memcheck-msg-bittorrent-raw-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%12.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw --cfg=contexts/nthreads:4  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/)
+  ADD_TEST(memcheck-msg-kademlia-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/kademlia/kademlia ./../msg_platform.xml ./kademlia.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia/)
+  ADD_TEST(memcheck-msg-kademlia-raw-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/kademlia/kademlia ./../msg_platform.xml ./kademlia.xml "--log=root.fmt:[%10.6r]%e(%02i:%P@%h)%e%m%n" --cfg=contexts/factory:raw --cfg=contexts/nthreads:4  --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/kademlia/)
 endif(HAVE_RAWCTX)
 
 IF(${ARCH_32_BITS})
@@ -441,19 +459,25 @@ ELSE(${ARCH_32_BITS})
 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-typed-tasks-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_typed_tasks_test --cfg=network/TCP_gamma:4194304 ${CMAKE_HOME_DIRECTORY}/examples/simdag/2clusters.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
-ADD_TEST(memcheck-simdag-test-comm-throttling-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_comm_throttling ${CMAKE_HOME_DIRECTORY}/examples/simdag/2clusters.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
+ADD_TEST(memcheck-simdag-test-fail-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_fail --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/)
+ADD_TEST(memcheck-simdag-test-comm-throttling-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_comm_throttling --cfg=network/TCP_gamma:4194304 ${CMAKE_HOME_DIRECTORY}/examples/simdag/2clusters.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
+ADD_TEST(memcheck-simdag-test-dax-0 ${CMAKE_BINARY_DIR}/examples/simdag/dax/dax_test --log=no_loc ../2clusters.xml ./smalldax.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax/)
+ADD_TEST(memcheck-simdag-test-dax-1 cat ./smalldax.trace --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax/)
+ADD_TEST(memcheck-simdag-test-dax-2 cmake -E remove -f ./smalldax.trace --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax/)
 ADD_TEST(memcheck-simdag-test-dax-cycle-0 ${CMAKE_BINARY_DIR}/examples/simdag/dax/dax_test --log=no_loc ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax/../2clusters.xml ${CMAKE_HOME_DIRECTORY}/examples/simdag/dax/simple_dax_with_cycle.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/dax/)
 ADD_TEST(memcheck-simdag-test-prop-0 ${CMAKE_BINARY_DIR}/examples/simdag/properties/sd_prop ${CMAKE_HOME_DIRECTORY}/examples/simdag/../platforms/prop.xml --cd ${CMAKE_BINARY_DIR}/examples/simdag/)
 ADD_TEST(memcheck-simdag-test-minmin-scheduling-0 ${CMAKE_BINARY_DIR}/examples/simdag/scheduling/minmin_test --log=sd_daxparse.thresh:critical ./simulacrum_7_hosts.xml ./Montage_25.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/scheduling/)
@@ -526,6 +550,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-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/)
@@ -561,13 +588,17 @@ 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-simdag-test-lua-0 ${CMAKE_HOME_DIRECTORY}/examples/simdag/sd_test2 ..lua/console/platform.lua --cd ${CMAKE_HOME_DIRECTORY}/examples/simdag/)
+  ADD_TEST(memcheck-lua-bittorrent-0 lua bittorrent.lua --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/bittorrent/)
+  ADD_TEST(memcheck-lua-kademlia-0 lua kademlia.lua --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/kademlia/)
+  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-masterslave-bypass-0         PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
   set_tests_properties(memcheck-lua-msg-masterslave-console-0    PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
   set_tests_properties(memcheck-lua-chord-0                      PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
+  set_tests_properties(memcheck-lua-bittorrent-0                 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
+  set_tests_properties(memcheck-lua-kademlia-0                   PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
   set_tests_properties(memcheck-simdag-test-lua-0                PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so")
 endif(HAVE_LUA)