ADD_TEST(memcheck-msg-masterslave-forwarder-0 masterslave/masterslave_forwarder ./msg_platform.xml ./masterslave/deployment_masterslave_forwarder.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
ADD_TEST(memcheck-msg-masterslave-failure-0 masterslave/masterslave_failure --log=xbt_cfg.thres:critical --log=no_loc ./small_platform_with_failures.xml ./masterslave/deployment_masterslave.xml --cfg=path:${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/examples/msg/)
ADD_TEST(memcheck-msg-masterslave-bypass-0 masterslave/masterslave_bypass --log=no_loc --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-masterslave-console-0 masterslave_console platform_script.lua --log=surf_parse.thres:critical --cd ${PROJECT_DIRECTORY}/examples/msg/masterslave//)
ADD_TEST(memcheck-msg-masterslave-mailbox-0 masterslave/masterslave_mailbox ./small_platform_with_routers.xml ./masterslave/deployment_masterslave_mailbox.xml --trace --cd ${PROJECT_DIRECTORY}/examples/msg/)
ADD_TEST(memcheck-msg-masterslave-vivaldi-0 ./masterslave/masterslave_mailbox --cfg=network/model:Vivaldi ../platforms/vivaldi.xml ./masterslave/deployment_masterslave_vivaldi.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
ADD_TEST(memcheck-msg-migration-0 migration/migration ./msg_platform.xml ./migration/migration.deploy --cd ${PROJECT_DIRECTORY}/examples/msg/)
ADD_TEST(memcheck-msg-masterslave_cpu_ti-1 masterslave/masterslave_forwarder ./msg_platform.xml ./masterslave/deployment_masterslave_forwarder.xml --cfg=cpu/model:CpuTI --cd ${PROJECT_DIRECTORY}/examples/msg/)
ADD_TEST(memcheck-msg-masterslave_cpu_ti-2 masterslave/masterslave_failure --log=xbt_cfg.thres:critical --log=no_loc ./small_platform_with_failures.xml ./masterslave/deployment_masterslave.xml --cfg=path:${PROJECT_DIRECTORY}/src --cfg=cpu/model:CpuTI --cd ${PROJECT_DIRECTORY}/examples/msg/)
ADD_TEST(memcheck-msg-masterslave_cpu_ti-3 masterslave/masterslave_bypass --log=no_loc --cfg=cpu/model:CpuTI --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg_icomms-0 ./peer small_platform.xml deployment_peer01.xml --cd ${PROJECT_DIRECTORY}/examples/msg/icomms/)
+ADD_TEST(memcheck-msg_icomms-1 ./peer small_platform.xml deployment_peer02.xml --cd ${PROJECT_DIRECTORY}/examples/msg/icomms/)
+ADD_TEST(memcheck-msg_icomms-2 ./peer small_platform.xml deployment_peer03.xml --cd ${PROJECT_DIRECTORY}/examples/msg/icomms/)
+ADD_TEST(memcheck-msg_icomms-3 ./peer small_platform.xml deployment_peer04.xml --cd ${PROJECT_DIRECTORY}/examples/msg/icomms/)
+ADD_TEST(memcheck-msg_icomms-4 ./peer2 small_platform.xml deployment_peer.xml --cd ${PROJECT_DIRECTORY}/examples/msg/icomms/)
IF(HAVE_TRACING)
ADD_TEST(memcheck-tracing-ms-0 tracing/ms ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-tracing-ms-1 cat ./tracing/../simulation.trace --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-ms-1 cat ./tracing/../ms.trace --cd ${PROJECT_DIRECTORY}/examples/msg/)
ADD_TEST(memcheck-tracing-categories-0 tracing/categories ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
ADD_TEST(memcheck-tracing-categories-1 cat ./tracing/../categories.trace --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-volume-0 tracing/volume ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-tasks-0 tracing/tasks ./tracing/platform.xml ./tracing/deployment.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-process-migration-0 tracing/procmig ./tracing/platform.xml ./tracing/procmig-deploy.xml --cd ${PROJECT_DIRECTORY}/examples/msg/)
ENDIF(HAVE_TRACING)
-
IF(${ARCH_32_BITS})
ADD_TEST(memcheck-gras-ping-sg-32-0 ./ping_simulator ./../../msg/small_platform.xml ./ping.xml --cd ${PROJECT_DIRECTORY}/examples/gras/ping/)
ADD_TEST(memcheck-gras-rpc-sg-32-0 ./rpc_simulator ./../../msg/small_platform.xml ./rpc.xml --log=root.fmt:"'[%h:%P:(%i)] [%c/%p] %m%n'" --cd ${PROJECT_DIRECTORY}/examples/gras/rpc/)
# amok examples
IF(${ARCH_32_BITS})
-ADD_TEST(memcheck-amok-bandwidth-sg-32-0 bandwidth/bandwidth_simulator${EXEEXT} ./../msg/small_platform.xml ./bandwidth/bandwidth.xml --cd ${PROJECT_DIRECTORY}/examples/amok/)
-ADD_TEST(memcheck-amok-saturate-sg-32-0 saturate/saturate_simulator${EXEEXT} ./../msg/small_platform.xml ./saturate/saturate.xml --cd ${PROJECT_DIRECTORY}/examples/amok/)
+ADD_TEST(memcheck-amok-bandwidth-sg-32-0 bandwidth/bandwidth_simulator ./../msg/small_platform.xml ./bandwidth/bandwidth.xml --cd ${PROJECT_DIRECTORY}/examples/amok/)
+ADD_TEST(memcheck-amok-saturate-sg-32-0 saturate/saturate_simulator ./../msg/small_platform.xml ./saturate/saturate.xml --cd ${PROJECT_DIRECTORY}/examples/amok/)
ELSE(${ARCH_32_BITS})
-ADD_TEST(memcheck-amok-bandwidth-sg-64-0 bandwidth/bandwidth_simulator${EXEEXT} ./../msg/small_platform.xml ./bandwidth/bandwidth.xml --cd ${PROJECT_DIRECTORY}/examples/amok/)
-ADD_TEST(memcheck-amok-saturate-sg-64-0 saturate/saturate_simulator${EXEEXT} ./../msg/small_platform.xml ./saturate/saturate.xml --cd ${PROJECT_DIRECTORY}/examples/amok/)
+ADD_TEST(memcheck-amok-bandwidth-sg-64-0 bandwidth/bandwidth_simulator ./../msg/small_platform.xml ./bandwidth/bandwidth.xml --cd ${PROJECT_DIRECTORY}/examples/amok/)
+ADD_TEST(memcheck-amok-saturate-sg-64-0 saturate/saturate_simulator ./../msg/small_platform.xml ./saturate/saturate.xml --cd ${PROJECT_DIRECTORY}/examples/amok/)
ENDIF(${ARCH_32_BITS})
# simdag examples
ADD_TEST(memcheck-simdag-test_simdag-0 ./sd_test ./../msg/msg_platform.xml --cd ${PROJECT_DIRECTORY}/examples/simdag/)
ADD_TEST(memcheck-simdag-test_simdag2-0 ./sd_test2 ./2clusters.xml --cd ${PROJECT_DIRECTORY}/examples/simdag/)
+ADD_TEST(memcheck-simdag-test_simdag_seq_access-0 ./sd_seq_access ./2clusters.xml --cd ${PROJECT_DIRECTORY}/examples/simdag/)
ADD_TEST(memcheck-simdag-test_prop-0 properties/sd_prop ./../platforms/prop.xml --cd ${PROJECT_DIRECTORY}/examples/simdag/)
ADD_TEST(memcheck-simdag-metaxml_test-0 metaxml/sd_meta ./../platforms/metaxml.xml --cd ${PROJECT_DIRECTORY}/examples/simdag/)
+ADD_TEST(memcheck-simdag-minmin_test-0 ./minmin_test --log=sd_daxparse.thresh:critical ./simulacrum_7_hosts.xml ./Montage_25.xml --cd ${PROJECT_DIRECTORY}/examples/simdag/scheduling/)
+if(enable_smpi)
# smpi examples
-ADD_TEST(memcheck-smpi-bcast-0 ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 3 ./bcast -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-ADD_TEST(memcheck-smpi-bcast-1 ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 6 ./bcast -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-ADD_TEST(memcheck-smpi-bcast-2 ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 12 ./bcast -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-ADD_TEST(memcheck-smpi-reduce-0 ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 3 ./reduce -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-ADD_TEST(memcheck-smpi-reduce-1 ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 6 ./reduce -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
-ADD_TEST(memcheck-smpi-reduce-2 ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 12 ./reduce -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
+ADD_TEST(memcheck-smpi-bcast-0 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 3 ./bcast -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
+ADD_TEST(memcheck-smpi-bcast-1 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 6 ./bcast -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
+ADD_TEST(memcheck-smpi-bcast-2 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 12 ./bcast -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
+ADD_TEST(memcheck-smpi-reduce-0 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 3 ./reduce -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
+ADD_TEST(memcheck-smpi-reduce-1 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 6 ./reduce -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
+ADD_TEST(memcheck-smpi-reduce-2 ${CMAKE_BINARY_DIR}/bin/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 12 ./reduce -q --cd ${PROJECT_DIRECTORY}/examples/smpi/)
+endif(enable_smpi)
if(HAVE_GTNETS)
ADD_TEST(memcheck-msg-gtnets-waxman-0 gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${PROJECT_DIRECTORY}/examples/msg/)
if(HAVE_LUA)
ADD_TEST(memcheck-lua-masterslave-0 lua master_slave.lua --cd ${PROJECT_DIRECTORY}/examples/lua/)
ADD_TEST(memcheck-lua-mult_matrix-0 lua mult_matrix.lua --cd ${PROJECT_DIRECTORY}/examples/lua/)
+ADD_TEST(memcheck-lua-masterslave_bypass-0 lua master_slave.lua --log=surf_parse.thres:critical --cd ${PROJECT_DIRECTORY}/examples/lua/)
endif(HAVE_LUA)
# Ruby examples
ADD_TEST(memcheck-ruby-ping_pong-0 ruby -I ../../src/bindings/ruby PingPong.rb --cd ${PROJECT_DIRECTORY}/examples/ruby/)
ADD_TEST(memcheck-ruby-quicksort-0 ruby -I ../../src/bindings/ruby Quicksort.rb --cd ${PROJECT_DIRECTORY}/examples/ruby/)
endif(HAVE_RUBY)
+
endif(enable_memcheck)
