X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a5f04303fede6c66ee161297d17a0979a8e691e..0bb379e3b645a2d1cbc8ff1c4d2e4fa4f78fa377:/buildtools/Cmake/memcheck_tests.cmake

diff --git a/buildtools/Cmake/memcheck_tests.cmake b/buildtools/Cmake/memcheck_tests.cmake
index f109505dda..ad18418865 100644
--- a/buildtools/Cmake/memcheck_tests.cmake
+++ b/buildtools/Cmake/memcheck_tests.cmake
@@ -148,11 +148,11 @@ ADD_TEST(memcheck-msg_actions-4 ${CMAKE_HOME_DIRECTORY}/examples/msg/actions/act
 ADD_TEST(memcheck-msg_actions-5 ${CMAKE_HOME_DIRECTORY}/examples/msg/actions/actions --log=actions.thres=verbose --log=root.fmt:[%h:%P:(%i)%e%r]%e%m%n homogeneous_3_hosts.xml deployment.xml actions_with_isend.txt --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/actions/)
 
 IF(HAVE_TRACING)
-ADD_TEST(memcheck-tracing-ms-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/ms --cfg=tracing:1 --cfg=tracing/filename:ms.trace --cfg=tracing/platform:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-tracing-categories-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/categories --cfg=tracing:1 --cfg=tracing/filename:categories.trace --cfg=tracing/platform:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-ms-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/ms --cfg=tracing:1 --cfg=tracing/filename:ms.trace --cfg=tracing/categorized:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-categories-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/categories --cfg=tracing:1 --cfg=tracing/filename:categories.trace --cfg=tracing/categorized:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-tracing-volume-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/volume --cfg=tracing:1 --cfg=tracing/filename:volume.trace --cfg=tracing/msg/volume:1 ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-tracing-tasks-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/tasks --cfg=tracing:1 --cfg=tracing/msg/task:1 --cfg=tracing/filename:tasks.trace ./tracing/platform.xml ./tracing/deployment.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-tracing-process-migration-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/procmig --cfg=tracing:1 --cfg=tracing/platform:1 --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:1 ./tracing/platform.xml ./tracing/procmig-deploy.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-tracing-process-migration-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/tracing/procmig --cfg=tracing:1 --cfg=tracing/categorized:1 --cfg=tracing/filename:procmig.trace --cfg=tracing/msg/process:1 ./tracing/platform.xml ./tracing/procmig-deploy.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
 ENDIF(HAVE_TRACING)
 
 IF(${ARCH_32_BITS})
@@ -203,11 +203,11 @@ ADD_TEST(memcheck-msg-gtnets-onelink-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtne
 ADD_TEST(memcheck-msg-gtnets-dogbone-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-onelink-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu/model:Cas01  --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   if(HAVE_TRACING)
-ADD_TEST(memcheck-msg-tracing-gtnets-waxman-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=tracing/filename:waxman_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-msg-tracing-gtnets-onelink-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_gtnets.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_lv08.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
-ADD_TEST(memcheck-msg-tracing-gtnets-onelink-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_lv08.trace --cfg=tracing/platform:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01  --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-tracing-gtnets-waxman-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=tracing/filename:waxman_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-tracing-gtnets-onelink-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_gtnets.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:GTNets --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=tracing/filename:dogbone_lv08.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01 --cfg=network/model:LV08 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-tracing-gtnets-onelink-lv08-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=tracing/filename:onelink_lv08.trace --cfg=tracing/categorized:1 --cfg=workstation/model:compound --cfg=cpu/model:Cas01  --cfg=network/model:LV08 2>&1 | grep --color=auto -v root/INFO | grep -v simix_network/INFO --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-fullduplex-0 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex:0 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-gtnets-fullduplex-1 ${CMAKE_HOME_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex:1 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/)
   endif(HAVE_TRACING)