Update memcheck tests.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8614 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/buildtools/Cmake/memcheck_tests.cmake b/buildtools/Cmake/memcheck_tests.cmake
index 0ae5275..3b87d03 100644 (file)
--- a/buildtools/Cmake/memcheck_tests.cmake
+++ b/buildtools/Cmake/memcheck_tests.cmake
@@ -48,8 +48,10 @@ ADD_TEST(memcheck-tesh-simdag-parser-13 ${PROJECT_DIRECTORY}/teshsuite/simdag/pl
 ADD_TEST(memcheck-tesh-simdag-parser-14 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test two_clusters.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-parser-15 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test two_hosts_multi_hop.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-parser-16 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test two_hosts_one_link.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-parser-14 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test two_clusters.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-parser-15 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test two_hosts_multi_hop.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-parser-16 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test two_hosts_one_link.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)

-ADD_TEST(memcheck-tesh-simdag-parser-bogus-symmetric-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/flatifier two_hosts_asymetric_BOGUS.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
-ADD_TEST(memcheck-tesh-simdag-parser-bogus-symmetric-1 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/flatifier two_hosts_asymetric_BOGUS2.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-17 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ./four_hosts_floyd.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-18 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ./four_hosts_floyd_bis.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-bogus-symmetric-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/flatifier two_hosts_asymetric_BOGUS.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-parser-bogus-symmetric-1 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/flatifier two_hosts_asymetric_BOGUS2.xml --log=root.fmt:[%10.6r]%e[%i:%P@%h]%e%m%n --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)

 ADD_TEST(memcheck-tesh-simdag-parser-sym-full-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-parser-sym-full-1 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test two_clusters_symmetric.xml FULL_LINK --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-parser-sym-full-2 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test two_hosts_one_link_symetrical.xml FULL_LINK --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-parser-sym-full-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test one_cluster_fullduplex.xml FULL_LINK --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-parser-sym-full-1 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test two_clusters_symmetric.xml FULL_LINK --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-parser-sym-full-2 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test two_hosts_one_link_symetrical.xml FULL_LINK --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)


@@ -71,6 +73,8 @@ ADD_TEST(memcheck-tesh-simdag-flatifier-13 ${PROJECT_DIRECTORY}/teshsuite/simdag
 ADD_TEST(memcheck-tesh-simdag-flatifier-14 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/flatifier two_clusters.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-flatifier-15 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/flatifier two_hosts_multi_hop.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-flatifier-16 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/flatifier two_hosts_one_link.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-flatifier-14 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/flatifier two_clusters.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-flatifier-15 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/flatifier two_hosts_multi_hop.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
 ADD_TEST(memcheck-tesh-simdag-flatifier-16 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/flatifier two_hosts_one_link.xml --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)

+ADD_TEST(memcheck-tesh-simdag-full_links-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ./four_hosts_floyd.xml FULL_LINK --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)
+ADD_TEST(memcheck-tesh-simdag-full_links-1 ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/basic_parsing_test ./four_hosts_floyd_bis.xml FULL_LINK --cd ${PROJECT_DIRECTORY}/teshsuite/simdag/platforms/)

 ADD_TEST(memcheck-tesh-simdag-basic0-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/basic0 ./simdag/basic_platform.xml --surf-path=${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/teshsuite/)
 ADD_TEST(memcheck-tesh-simdag-basic1-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/basic1 ./simdag/basic_platform.xml --surf-path=${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/teshsuite/)
 ADD_TEST(memcheck-tesh-simdag-basic2-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/basic2 ./simdag/basic_platform.xml --surf-path=${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/teshsuite/)
 ADD_TEST(memcheck-tesh-simdag-basic0-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/basic0 ./simdag/basic_platform.xml --surf-path=${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/teshsuite/)
 ADD_TEST(memcheck-tesh-simdag-basic1-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/basic1 ./simdag/basic_platform.xml --surf-path=${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/teshsuite/)
 ADD_TEST(memcheck-tesh-simdag-basic2-0 ${PROJECT_DIRECTORY}/teshsuite/simdag/basic2 ./simdag/basic_platform.xml --surf-path=${PROJECT_DIRECTORY}/src --cd ${PROJECT_DIRECTORY}/teshsuite/)


@@ -202,6 +206,9 @@ ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-0 ${PROJECT_DIRECTORY}/examples/msg
 ADD_TEST(memcheck-msg-tracing-gtnets-onelink-0 ${PROJECT_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 ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-lv08-0 ${PROJECT_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 ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-tracing-gtnets-onelink-lv08-0 ${PROJECT_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 ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-tracing-gtnets-onelink-0 ${PROJECT_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 ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-tracing-gtnets-dogbone-lv08-0 ${PROJECT_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 ${PROJECT_DIRECTORY}/examples/msg/)
 ADD_TEST(memcheck-msg-tracing-gtnets-onelink-lv08-0 ${PROJECT_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 ${PROJECT_DIRECTORY}/examples/msg/)

+ADD_TEST(memcheck-msg-gtnets-fullduplex-0 ${PROJECT_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex:0 --cd ${PROJECT_DIRECTORY}/examples/msg/)
+ADD_TEST(memcheck-msg-gtnets-fullduplex-1 ${PROJECT_DIRECTORY}/examples/msg/gtnets/gtnets gtnets/fullduplex-p.xml gtnets/fullduplex-d.xml --cfg=fullduplex:1 --cd ${PROJECT_DIRECTORY}/examples/msg/)
+

   endif(HAVE_TRACING)
 endif(HAVE_GTNETS)
 
   endif(HAVE_TRACING)
 endif(HAVE_GTNETS)