Commit ae57be8d authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

refs #5127 handle jemalloc static linking with --soname-synonyms from valgrind 3.8

git-svn-id: file:///svn/toku/tokudb@50724 c7de825b-a66e-492c-adef-691d508d4ae1
parent 032ed0c0
...@@ -34,6 +34,7 @@ list(APPEND CTEST_CUSTOM_MEMCHECK_IGNORE ...@@ -34,6 +34,7 @@ list(APPEND CTEST_CUSTOM_MEMCHECK_IGNORE
ydb/stress-gc2.tdb ydb/stress-gc2.tdb
ydb/stress-test.bdb ydb/stress-test.bdb
ydb/stress-test.tdb ydb/stress-test.tdb
ydb/test-5138.tdb
ydb/test-prepare.tdb ydb/test-prepare.tdb
ydb/test-prepare2.tdb ydb/test-prepare2.tdb
ydb/test-prepare3.tdb ydb/test-prepare3.tdb
......
...@@ -4,7 +4,7 @@ if(BUILD_TESTING) ...@@ -4,7 +4,7 @@ if(BUILD_TESTING)
# that is hard to parse out, so we'll just let it run alone # that is hard to parse out, so we'll just let it run alone
set(MEMORYCHECK_COMMAND "${TokuDB_SOURCE_DIR}/scripts/tokuvalgrind") set(MEMORYCHECK_COMMAND "${TokuDB_SOURCE_DIR}/scripts/tokuvalgrind")
endif () endif ()
set(MEMORYCHECK_COMMAND_OPTIONS "--gen-suppressions=no --quiet --num-callers=20 --leak-check=full --show-reachable=yes --trace-children=yes --trace-children-skip=sh,*/sh,basename,*/basename,dirname,*/dirname,rm,*/rm,cp,*/cp,mv,*/mv,cat,*/cat,diff,*/diff,grep,*/grep,date,*/date,test,*/tokudb_dump* --trace-children-skip-by-arg=--only_create,--test,--no-shutdown,novalgrind" CACHE INTERNAL "options for valgrind") set(MEMORYCHECK_COMMAND_OPTIONS "--gen-suppressions=no --soname-synonyms=somalloc=*tokuportability* --quiet --num-callers=20 --leak-check=full --show-reachable=yes --trace-children=yes --trace-children-skip=sh,*/sh,basename,*/basename,dirname,*/dirname,rm,*/rm,cp,*/cp,mv,*/mv,cat,*/cat,diff,*/diff,grep,*/grep,date,*/date,test,*/tokudb_dump* --trace-children-skip-by-arg=--only_create,--test,--no-shutdown,novalgrind" CACHE INTERNAL "options for valgrind")
set(MEMORYCHECK_SUPPRESSIONS_FILE "${CMAKE_CURRENT_BINARY_DIR}/valgrind.suppressions" CACHE INTERNAL "suppressions file for valgrind") set(MEMORYCHECK_SUPPRESSIONS_FILE "${CMAKE_CURRENT_BINARY_DIR}/valgrind.suppressions" CACHE INTERNAL "suppressions file for valgrind")
set(UPDATE_COMMAND "svn") set(UPDATE_COMMAND "svn")
endif() endif()
...@@ -106,7 +106,7 @@ if (BUILD_TESTING OR BUILD_FT_TESTS OR BUILD_SRC_TESTS) ...@@ -106,7 +106,7 @@ if (BUILD_TESTING OR BUILD_FT_TESTS OR BUILD_SRC_TESTS)
"${helgrind_drd_depend_conditions}" OFF) "${helgrind_drd_depend_conditions}" OFF)
## setup a function to write tests that will run with helgrind ## setup a function to write tests that will run with helgrind
set(CMAKE_HELGRIND_COMMAND_STRING "valgrind --quiet --tool=helgrind --error-exitcode=1 --suppressions=${TokuDB_SOURCE_DIR}/src/tests/helgrind.suppressions --trace-children=yes --trace-children-skip=sh,*/sh,basename,*/basename,dirname,*/dirname,rm,*/rm,cp,*/cp,mv,*/mv,cat,*/cat,diff,*/diff,grep,*/grep,date,*/date,test,*/tokudb_dump* --trace-children-skip-by-arg=--only_create,--test,--no-shutdown,novalgrind") set(CMAKE_HELGRIND_COMMAND_STRING "valgrind --quiet --tool=helgrind --error-exitcode=1 --soname-synonyms=somalloc=*tokuportability* --suppressions=${TokuDB_SOURCE_DIR}/src/tests/helgrind.suppressions --trace-children=yes --trace-children-skip=sh,*/sh,basename,*/basename,dirname,*/dirname,rm,*/rm,cp,*/cp,mv,*/mv,cat,*/cat,diff,*/diff,grep,*/grep,date,*/date,test,*/tokudb_dump* --trace-children-skip-by-arg=--only_create,--test,--no-shutdown,novalgrind")
function(add_helgrind_test name) function(add_helgrind_test name)
separate_arguments(CMAKE_HELGRIND_COMMAND_STRING) separate_arguments(CMAKE_HELGRIND_COMMAND_STRING)
add_test( add_test(
...@@ -116,7 +116,7 @@ if (BUILD_TESTING OR BUILD_FT_TESTS OR BUILD_SRC_TESTS) ...@@ -116,7 +116,7 @@ if (BUILD_TESTING OR BUILD_FT_TESTS OR BUILD_SRC_TESTS)
endfunction(add_helgrind_test) endfunction(add_helgrind_test)
## setup a function to write tests that will run with drd ## setup a function to write tests that will run with drd
set(CMAKE_DRD_COMMAND_STRING "valgrind --quiet --tool=drd --error-exitcode=1 --suppressions=${TokuDB_SOURCE_DIR}/src/tests/drd.suppressions --trace-children=yes --trace-children-skip=sh,*/sh,basename,*/basename,dirname,*/dirname,rm,*/rm,cp,*/cp,mv,*/mv,cat,*/cat,diff,*/diff,grep,*/grep,date,*/date,test,*/tokudb_dump* --trace-children-skip-by-arg=--only_create,--test,--no-shutdown,novalgrind") set(CMAKE_DRD_COMMAND_STRING "valgrind --quiet --tool=drd --error-exitcode=1 --soname-synonyms=somalloc=*tokuportability* --suppressions=${TokuDB_SOURCE_DIR}/src/tests/drd.suppressions --trace-children=yes --trace-children-skip=sh,*/sh,basename,*/basename,dirname,*/dirname,rm,*/rm,cp,*/cp,mv,*/mv,cat,*/cat,diff,*/diff,grep,*/grep,date,*/date,test,*/tokudb_dump* --trace-children-skip-by-arg=--only_create,--test,--no-shutdown,novalgrind")
function(add_drd_test name) function(add_drd_test name)
separate_arguments(CMAKE_DRD_COMMAND_STRING) separate_arguments(CMAKE_DRD_COMMAND_STRING)
add_test( add_test(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment