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

fixed: properly locate valgrind

Browse Source
This commit is contained in:
Arne Morten Kvarving
2016-08-31 11:50:55 +02:00
parent 48c6cbc949
commit 8eb7ad930f
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/Scripts/IFEMTesting.cmake
View File

@@ -59,7 +59,7 @@ function(IFEM_add_test name binary)
set(test-name "${binary}+${name}")
endif()
if(IFEM_TEST_MEMCHECK)
add_test("${test-name}" regtest.sh "${MEMORYCHECK_COMMAND} --log-file=${CMAKE_BINARY_DIR}/valgrindlog ${EXECUTABLE_OUTPUT_PATH}/${binary}" ${PROJECT_SOURCE_DIR}/${TEST_SUBDIR}/Test/${name} ${ARGN})
add_test("${test-name}" regtest.sh "${MEMCHECK_COMMAND} --log-file=${CMAKE_BINARY_DIR}/valgrindlog ${EXECUTABLE_OUTPUT_PATH}/${binary}" ${PROJECT_SOURCE_DIR}/${TEST_SUBDIR}/Test/${name} ${ARGN})
else(IFEM_TEST_MEMCHECK)
add_test("${test-name}" regtest.sh ${EXECUTABLE_OUTPUT_PATH}/${binary} ${PROJECT_SOURCE_DIR}/${TEST_SUBDIR}/Test/${name} ${ARGN})
endif(IFEM_TEST_MEMCHECK)
@@ -80,7 +80,7 @@ macro(add_check_target)
list(GET UNIT_TEST${test_number} 1 dir)
list(GET UNIT_TEST${test_number} 2 -1 cmd)
if(IFEM_TEST_MEMCHECK)
set(cmd valgrind ${cmd})
set(cmd ${MEMCHECK_COMMAND} ${cmd})
endif()
add_test(NAME ${name} WORKING_DIRECTORY ${dir} COMMAND ${cmd})
endforeach()
@@ -97,6 +97,13 @@ macro(add_check_target)
endif()
endmacro()
if(IFEM_TEST_MEMCHECK)
find_program(MEMCHECK_COMMAND valgrind)
if(NOT MEMCHECK_COMMAND)
message(FATAL_ERROR "Could not locate valgrind and IFEM_TEST_MEMCHECK is requested.")
endif()
endif()
set(IFEM_TESTING_INCLUDED 1)
if(IFEM_INTREE_BUILD)
include_directories(${IFEM_PATH}/3rdparty/gtest/include)