Rename configuration variables *_model into */model (to start a hierarchy)

[simgrid.git] / buildtools / Cmake / src / memcheck_tests.txt

diff --git a/buildtools/Cmake/src/memcheck_tests.txt b/buildtools/Cmake/src/memcheck_tests.txt
index 31db6dd..c3cd590 100644 (file)
--- a/buildtools/Cmake/src/memcheck_tests.txt
+++ b/buildtools/Cmake/src/memcheck_tests.txt
@@ -109,9 +109,9 @@ ADD_TEST(memcheck-gras-properties-rl-0 /bin/sh -c "cd ~/Developments/simgrid/exa
 ADD_TEST(memcheck-gras-properties-rl-1 /bin/sh -c "cd ~/Developments/simgrid/examples/gras/properties/ && ./properties_bob --log=root.fmt=%P:%t%e%m%n")
 
 # MSG examples
-ADD_TEST(memcheck-msg-sendrecv_CLM03-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml --cfg=workstation_model:CLM03 --cfg=cpu_model:Cas01 --cfg=network_model:CM02")
-ADD_TEST(memcheck-msg-sendrecv_Vegas-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Vegas"")
-ADD_TEST(memcheck-msg-sendrecv_Reno-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation_model:compound cpu_model:Cas01 network_model:Reno" --log=surf_lagrange.thres=critical")
+ADD_TEST(memcheck-msg-sendrecv_CLM03-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml --cfg=workstation/model:CLM03 --cfg=cpu_model:Cas01 --cfg=network_model:CM02")
+ADD_TEST(memcheck-msg-sendrecv_Vegas-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu_model:Cas01 network_model:Vegas"")
+ADD_TEST(memcheck-msg-sendrecv_Reno-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && sendrecv/sendrecv ./sendrecv/platform_sendrecv.xml ./sendrecv/deployment_sendrecv.xml "--cfg=workstation/model:compound cpu_model:Cas01 network_model:Reno" --log=surf_lagrange.thres=critical")
 ADD_TEST(memcheck-msg-suspend-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && suspend/suspend ./msg_platform.xml ./suspend/deployment_suspend.xml ")
 ADD_TEST(memcheck-msg-masterslave-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./small_platform.xml ./masterslave/deployment_masterslave.xml")
 ADD_TEST(memcheck-msg-masterslave-forwarder-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./msg_platform.xml ./masterslave/deployment_masterslave_forwarder.xml ")
@@ -122,17 +122,17 @@ ADD_TEST(memcheck-msg-ptask-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg
 ADD_TEST(memcheck-msg-ptask-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && parallel_task/test_ptask ./parallel_task/test_ptask_platform.xml ./parallel_task/test_ptask_deployment.xml")
 ADD_TEST(memcheck-msg-priority-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && priority/priority ./small_platform.xml  ./priority/deployment_priority.xml")
 ADD_TEST(memcheck-msg-properties-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && properties/msg_prop ./../platforms/prop.xml ./properties/deployment_properties.xml ")
-ADD_TEST(memcheck-msg-trace-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test1.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test2.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test3.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-3 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test4.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-4 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test5.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-5 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test6.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-6 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test7.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-7 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test8.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-8 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test9.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-9 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test10.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
-ADD_TEST(memcheck-msg-trace-10 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test11.xml --cfg=workstation_model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test1.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test2.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test3.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-3 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test4.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-4 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test5.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-5 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test6.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-6 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test7.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-7 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test8.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-8 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test9.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-9 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test10.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
+ADD_TEST(memcheck-msg-trace-10 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && trace/test_trace_integration ./trace/test11.xml --cfg=workstation/model:compound --cfg=network_model:CM02 --cfg=cpu_model:CpuTI")
 ADD_TEST(memcheck-msg-masterslave_cpu_ti-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./small_platform.xml ./masterslave/deployment_masterslave.xml --cfg=cpu_model:CpuTI")
 ADD_TEST(memcheck-msg-masterslave_cpu_ti-1 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && masterslave/masterslave_forwarder ./msg_platform.xml ./masterslave/deployment_masterslave_forwarder.xml --cfg=cpu_model:CpuTI")
 ADD_TEST(memcheck-msg-masterslave_cpu_ti-2 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && 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")
@@ -186,11 +186,11 @@ ADD_TEST(memcheck-smpi-reduce-0 /bin/sh -c "cd ~/Developments/simgrid/examples/s
 ADD_TEST(memcheck-smpi-reduce-1 /bin/sh -c "cd ~/Developments/simgrid/examples/smpi/ && ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 6 ./reduce -q")
 ADD_TEST(memcheck-smpi-reduce-2 /bin/sh -c "cd ~/Developments/simgrid/examples/smpi/ && ../../src/smpi/smpirun -map -hostfile ./hostfile -platform ./../msg/small_platform.xml -np 12 ./reduce -q ")
 if(HAVE_GTNETS)
-ADD_TEST(memcheck-msg-gtnets1-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
-ADD_TEST(memcheck-msg-gtnets2-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
-ADD_TEST(memcheck-msg-gtnets3-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
-ADD_TEST(memcheck-msg-gtnets4-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation_model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08")
-ADD_TEST(memcheck-msg-gtnets5-0 /bin/sh -c "cd ~/Developments/simgrid/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")
+ADD_TEST(memcheck-msg-gtnets1-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/waxman-p.xml gtnets/waxman-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
+ADD_TEST(memcheck-msg-gtnets2-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
+ADD_TEST(memcheck-msg-gtnets3-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/onelink-p.xml gtnets/onelink-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:GTNets")
+ADD_TEST(memcheck-msg-gtnets4-0 /bin/sh -c "cd ~/Developments/simgrid/examples/msg/ && gtnets/gtnets gtnets/dogbone-p.xml gtnets/dogbone-d.xml --cfg=workstation/model:compound --cfg=cpu_model:Cas01 --cfg=network_model:LV08")
+ADD_TEST(memcheck-msg-gtnets5-0 /bin/sh -c "cd ~/Developments/simgrid/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")
 endif(HAVE_GTNETS)
 
 set(MEMCHECK_LIST