Distinguish outputs for mmalloc_test on 32 and 64bits architectures.

[simgrid.git] / buildtools / Cmake / memcheck_tests.cmake

diff --git a/buildtools/Cmake/memcheck_tests.cmake b/buildtools/Cmake/memcheck_tests.cmake
index e4bb71a..faa1887 100644 (file)
--- a/buildtools/Cmake/memcheck_tests.cmake
+++ b/buildtools/Cmake/memcheck_tests.cmake
@@ -4,9 +4,14 @@ ADD_TEST(help                                 ${CMAKE_BINARY_DIR}/teshsuite/simd
 ADD_TEST(help-models                          ${CMAKE_BINARY_DIR}/teshsuite/simdag/platforms/basic_parsing_test --help-models)
 
 # teshsuite/xbt
-ADD_TEST(memcheck-tesh-log-large-0 ${CMAKE_BINARY_DIR}/teshsuite/xbt/log_large_test "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
-ADD_TEST(memcheck-tesh-log-large-1 ${CMAKE_BINARY_DIR}/teshsuite/xbt/log_large_test "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
-ADD_TEST(memcheck-tesh-log-parallel-0 ${CMAKE_BINARY_DIR}/teshsuite/xbt/parallel_log_crashtest "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
+ADD_TEST(memcheck-xbt-log-large-0 ${CMAKE_BINARY_DIR}/teshsuite/xbt/log_large_test "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
+ADD_TEST(memcheck-xbt-log-large-1 ${CMAKE_BINARY_DIR}/teshsuite/xbt/log_large_test "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
+ADD_TEST(memcheck-xbt-log-parallel-0 ${CMAKE_BINARY_DIR}/teshsuite/xbt/parallel_log_crashtest "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
+IF(${ARCH_32_BITS})
+  ADD_TEST(memcheck-xbt-mmalloc-32-0 ${CMAKE_BINARY_DIR}/teshsuite/xbt/mmalloc_test --log=root.fmt:%m%n --cd ${CMAKE_BINARY_DIR}/teshsuite/)
+ELSE(${ARCH_32_BITS})
+  ADD_TEST(memcheck-xbt-mmalloc-64-0 ${CMAKE_BINARY_DIR}/teshsuite/xbt/mmalloc_test --log=root.fmt:%m%n --cd ${CMAKE_BINARY_DIR}/teshsuite/)
+ENDIF(${ARCH_32_BITS})
 
 # teshsuite/gras/datadesc directory
 ADD_TEST(memcheck-tesh-gras-dd-mem-0 ${CMAKE_BINARY_DIR}/teshsuite/gras/datadesc/datadesc_usage --copy "--log=root.fmt:%m%n" --cd ${CMAKE_BINARY_DIR}/teshsuite/)
@@ -144,6 +149,7 @@ ADD_TEST(memcheck-msg-sendrecv-CLM03-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/s
 ADD_TEST(memcheck-msg-sendrecv-Vegas-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/sendrecv/sendrecv ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-sendrecv-Reno-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/sendrecv/sendrecv ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-suspend-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/suspend/suspend ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/deployment_suspend.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
+ADD_TEST(memcheck-msg-pmm-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/pmm/msg_pmm --log=msg_pmm.thres:verbose --log=no_loc ${CMAKE_HOME_DIRECTORY}/examples/msg/../platforms/cluster.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm_9_deploy.xml --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-masterslave-bypass-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_bypass --log=no_loc  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-masterslave-kill-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_kill ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/platform_kill.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/deployment_masterslave_kill.xml --log=surf_maxmin.thres:error --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
 ADD_TEST(memcheck-msg-masterslave-multicore-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_mailbox ${CMAKE_HOME_DIRECTORY}/examples/msg/../platforms/multicore_machine.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full --cfg=contexts/factory:thread  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -169,6 +175,7 @@ if(CONTEXT_UCONTEXT)
   ADD_TEST(memcheck-msg-sendrecv-Vegas-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/sendrecv/sendrecv ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas" "--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-sendrecv-Reno-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/sendrecv/sendrecv ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--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-suspend-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/suspend/suspend ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/deployment_suspend.xml  "--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-pmm-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/pmm/msg_pmm --log=msg_pmm.thres:verbose --log=no_loc ${CMAKE_HOME_DIRECTORY}/examples/msg/../platforms/cluster.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm_9_deploy.xml --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
   ADD_TEST(memcheck-msg-masterslave-bypass-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_bypass --log=no_loc  "--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-masterslave-kill-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_kill ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/platform_kill.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/deployment_masterslave_kill.xml --log=surf_maxmin.thres:error --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
   ADD_TEST(memcheck-msg-masterslave-multicore-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_mailbox ${CMAKE_HOME_DIRECTORY}/examples/msg/../platforms/multicore_machine.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full --cfg=contexts/factory:ucontext  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -192,6 +199,7 @@ if(HAVE_RAWCTX)
   ADD_TEST(memcheck-msg-sendrecv-Vegas-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/sendrecv/sendrecv ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Vegas" "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
   ADD_TEST(memcheck-msg-sendrecv-Reno-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/sendrecv/sendrecv ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/platform_sendrecv.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu/model:Cas01 network/model:Reno" --log=surf_lagrange.thres=critical "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
   ADD_TEST(memcheck-msg-suspend-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/suspend/suspend ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/suspend/deployment_suspend.xml  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
+  ADD_TEST(memcheck-msg-pmm-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/pmm/msg_pmm --log=msg_pmm.thres:verbose --log=no_loc ${CMAKE_HOME_DIRECTORY}/examples/msg/../platforms/cluster.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/pmm/pmm_9_deploy.xml --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
   ADD_TEST(memcheck-msg-masterslave-bypass-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_bypass --log=no_loc  "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
   ADD_TEST(memcheck-msg-masterslave-kill-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_kill ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/platform_kill.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/deployment_masterslave_kill.xml --log=surf_maxmin.thres:error --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
   ADD_TEST(memcheck-msg-masterslave-multicore-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_mailbox ${CMAKE_HOME_DIRECTORY}/examples/msg/../platforms/multicore_machine.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/deployment_masterslave_mailbox_multicore.xml --cfg=cpu/model:Cas01 --cfg=cpu/optim:Full --cfg=contexts/factory:raw  --cd ${CMAKE_BINARY_DIR}/examples/msg/)
@@ -475,6 +483,9 @@ ADD_TEST(memcheck-simdag-test-seq-access-0 ${CMAKE_BINARY_DIR}/examples/simdag/s
 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-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 ./dax.dot ./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/)