OilfieldToolsNet/LBPM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor updates to valgrind and example output tests

Browse Source
This commit is contained in:
Mark Berrill
2015-03-06 11:01:14 -05:00
parent 03bd04aa30
commit eef33a9a28
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ValgrindSuppresionFile
View File

@@ -30,11 +30,9 @@
{ {
expand_dynamic_string_token expand_dynamic_string_token
Memcheck:Cond Memcheck:Cond
... fun:index
fun:expand_dynamic_string_token fun:expand_dynamic_string_token
fun:_dl_map_object
... ...
} }

4
cmake/ctest_script.cmake
View File

@@ -158,8 +158,8 @@ ENDIF()
# Set valgrind options # Set valgrind options
#SET (VALGRIND_COMMAND_OPTIONS "--tool=memcheck --leak-check=yes --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe --suppressions=${LBPM_SOURCE_DIR}/ValgrindSuppresionFile" ) #SET (VALGRIND_COMMAND_OPTIONS "--tool=memcheck --leak-check=yes --track-fds=yes --num-callers=50 --show-reachable=yes --trace-children=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe --suppressions=${LBPM_SOURCE_DIR}/ValgrindSuppresionFile" )
SET( VALGRIND_COMMAND_OPTIONS "--tool=memcheck --leak-check=yes --track-fds=yes --num-callers=50 --show-reachable=yes --suppressions=${LBPM_SOURCE_DIR}/ValgrindSuppresionFile" ) SET( VALGRIND_COMMAND_OPTIONS "--tool=memcheck --leak-check=yes --track-fds=yes --num-callers=50 --show-reachable=yes --trace-children=yes --suppressions=${LBPM_SOURCE_DIR}/ValgrindSuppresionFile" )
IF ( USE_VALGRIND ) IF ( USE_VALGRIND )
SET( MEMORYCHECK_COMMAND ${VALGRIND_COMMAND} ) SET( MEMORYCHECK_COMMAND ${VALGRIND_COMMAND} )
SET( MEMORYCHECKCOMMAND ${VALGRIND_COMMAND} ) SET( MEMORYCHECKCOMMAND ${VALGRIND_COMMAND} )

2
cmake/macros.cmake
View File

@@ -472,7 +472,7 @@ MACRO( TEST_EXAMPLE EXAMPLE EXEFILE PROCS ${ARGN} )
SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES FAIL_REGULAR_EXPRESSION "${TEST_FAIL_REGULAR_EXPRESSION}" PROCESSORS ${PROCS} ) SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES FAIL_REGULAR_EXPRESSION "${TEST_FAIL_REGULAR_EXPRESSION}" PROCESSORS ${PROCS} )
SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES RESOURCE_LOCK ${EXEFILE} ) SET_TESTS_PROPERTIES( ${TESTNAME} PROPERTIES RESOURCE_LOCK ${EXEFILE} )
# Create a test that checks the output against the data in EXAMPLE/OutputAns.txt # Create a test that checks the output against the data in EXAMPLE/OutputAns.txt
IF ( EXISTS "${EXAMPLE_DIR}/ExampleOutput.txt" ) IF ( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${EXAMPLE}/ExampleOutput.txt" )
ADD_TEST( ADD_TEST(
NAME ${TESTNAME}-output NAME ${TESTNAME}-output
WORKING_DIRECTORY "${EXAMPLE_DIR}" WORKING_DIRECTORY "${EXAMPLE_DIR}"