From dda6d624c0e0e147284139024623b25a663b1ea8 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Tue, 3 Jul 2012 10:54:48 +0200 Subject: [PATCH] Update. --- buildtools/Cmake/memcheck_tests.cmake | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/buildtools/Cmake/memcheck_tests.cmake b/buildtools/Cmake/memcheck_tests.cmake index 892c47469c..9566c9cd18 100644 --- a/buildtools/Cmake/memcheck_tests.cmake +++ b/buildtools/Cmake/memcheck_tests.cmake @@ -258,6 +258,9 @@ ADD_TEST(memcheck-msg-chord-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chor ADD_TEST(memcheck-msg-chord-thread-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/factory:thread --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/) ADD_TEST(memcheck-msg-chord-thread-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord -nb_bits=6 ./../msg_platform.xml ./chord.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/nthreads:4 --cfg=contexts/factory:thread --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/) ADD_TEST(memcheck-msg-chord-thread-parallel-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/nthreads:4 --cfg=contexts/factory:thread --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/) +ADD_TEST(memcheck-msg-bittorrent-thread-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/) +ADD_TEST(memcheck-msg-bittorrent-thread-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:thread --cfg=contexts/nthreads:4 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/) + if(CONTEXT_UCONTEXT) ADD_TEST(memcheck-msg-migration-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/migration/migration ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.deploy "--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-ptask-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/parallel_task/parallel_task ${CMAKE_HOME_DIRECTORY}/examples/msg/small_platform.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cd ${CMAKE_BINARY_DIR}/examples/msg/) @@ -294,6 +297,9 @@ if(CONTEXT_UCONTEXT) ADD_TEST(memcheck-msg-chord-ucontext-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/factory:ucontext --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/) ADD_TEST(memcheck-msg-chord-ucontext-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord -nb_bits=6 ./../msg_platform.xml ./chord.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/nthreads:4 --cfg=contexts/factory:ucontext --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/) ADD_TEST(memcheck-msg-chord-ucontext-parallel-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/nthreads:4 --cfg=contexts/factory:ucontext --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/) + ADD_TEST(memcheck-msg-bittorrent-ucontext-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/) + ADD_TEST(memcheck-msg-bittorrent-ucontext-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:ucontext --cfg=contexts/nthreads:4 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/) + endif(CONTEXT_UCONTEXT) if(HAVE_RAWCTX) ADD_TEST(memcheck-msg-migration-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/migration/migration ${CMAKE_HOME_DIRECTORY}/examples/msg/msg_platform.xml ${CMAKE_HOME_DIRECTORY}/examples/msg/migration/migration.deploy "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw --cd ${CMAKE_BINARY_DIR}/examples/msg/) @@ -331,6 +337,9 @@ if(HAVE_RAWCTX) ADD_TEST(memcheck-msg-chord-raw-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/factory:raw --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/) ADD_TEST(memcheck-msg-chord-raw-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord -nb_bits=6 ./../msg_platform.xml ./chord.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/nthreads:4 --cfg=contexts/factory:raw --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/) ADD_TEST(memcheck-msg-chord-raw-parallel-1 ${CMAKE_BINARY_DIR}/examples/msg/chord/chord ./../../platforms/cluster.xml ./chord10.xml --log=msg_chord.thres:verbose "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cfg=network/model:Constant --cfg=contexts/nthreads:4 --cfg=contexts/factory:raw --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/chord/) + ADD_TEST(memcheck-msg-bittorrent-raw-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/) + ADD_TEST(memcheck-msg-bittorrent-raw-parallel-0 ${CMAKE_BINARY_DIR}/examples/msg/bittorrent/bittorrent ./../msg_platform.xml ./bittorrent.xml "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n" --cfg=contexts/factory:raw --cfg=contexts/nthreads:4 --cd ${CMAKE_HOME_DIRECTORY}/examples/msg/bittorrent/) + endif(HAVE_RAWCTX) IF(${ARCH_32_BITS}) @@ -566,6 +575,8 @@ if(HAVE_LUA) ADD_TEST(memcheck-lua-masterslave-bypass-0 lua master_slave_bypass.lua --log=surf_parse.thres:critical --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/console/) ADD_TEST(memcheck-lua-msg-masterslave-console-0 ${CMAKE_BINARY_DIR}/examples/msg/masterslave/masterslave_console ${CMAKE_HOME_DIRECTORY}/examples/msg/masterslave/platform_script.lua --log=surf_parse.thres:critical "--log=root.fmt:[%11.6r]%e(%i:%P@%h)%e%m%n" --cd ${CMAKE_BINARY_DIR}/examples/msg/masterslave/) ADD_TEST(memcheck-lua-chord-0 lua chord.lua ../../msg/msg_platform.xml ../../msg/chord/chord.xml --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/chord/) + ADD_TEST(memcheck-lua-bittorrent-0 lua bittorrent.lua --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/bittorrent/) + ADD_TEST(memcheck-lua-kademlia-0 lua kademlia.lua --cd ${CMAKE_HOME_DIRECTORY}/examples/lua/kademlia/) ADD_TEST(memcheck-simdag-test-lua-0 ${CMAKE_BINARY_DIR}/examples/simdag/sd_test2 ${CMAKE_HOME_DIRECTORY}/examples/simdag/../lua/console/platform.lua --cd ${CMAKE_BINARY_DIR}/examples/simdag/) set_tests_properties(memcheck-lua-duplicated-globals-0 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(memcheck-lua-masterslave-0 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") @@ -573,6 +584,8 @@ if(HAVE_LUA) set_tests_properties(memcheck-lua-masterslave-bypass-0 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(memcheck-lua-msg-masterslave-console-0 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(memcheck-lua-chord-0 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") + set_tests_properties(memcheck-lua-bittorrent-0 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") + set_tests_properties(memcheck-lua-kademlia-0 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") set_tests_properties(memcheck-simdag-test-lua-0 PROPERTIES ENVIRONMENT "LUA_CPATH=${CMAKE_BINARY_DIR}/examples/lua/?.so") endif(HAVE_LUA) -- 2.20.1