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

fixed: use a separate valgrind log for tests with IFEM_USE_MEMCHECK

Browse Source 
to allow parallel execution
This commit is contained in:
Arne Morten Kvarving committed 2021-09-14 08:19:12 +02:00
1 parent 9193befb12
commit c859e4231c
2 files changed
+65 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

cmake/Scripts/IFEMTesting.cmake
+12 -11
View File
@@ -101,11 +101,13 @@ function(IFEM_add_test name binary)
else()
set(test-name "${binary}+${name}")
endif()
if(ARGN)
set(ARGN "-m ${ARGN}")
endif()
if(IFEM_TEST_MEMCHECK)
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)
set(VALGRIND "-v ${MEMCHECK_COMMAND}")
endif()
add_test("${test-name}" regtest.sh ${VALGRIND} -a ${EXECUTABLE_OUTPUT_PATH}/${binary} -r ${PROJECT_SOURCE_DIR}/${TEST_SUBDIR}/Test/${name} ${ARGN})
endfunction()
function(IFEM_add_restart_test name binary rlevel)
@@ -115,14 +117,13 @@ function(IFEM_add_restart_test name binary rlevel)
else()
set(test-name "restart+${binary}+${name}")
endif()
string(REGEX MATCH "^(.*)\\.[^.]*$" dummy ${name})
set(rfile ${CMAKE_MATCH_1})
get_filename_component(rfile ${rfile} NAME)
if(ARGN)
set(ARGN "-m ${ARGN}")
endif()
if(IFEM_TEST_MEMCHECK)
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} ${rfile} ${rlevel} ${ARGN})
else(IFEM_TEST_MEMCHECK)
add_test("${test-name}" regtest.sh ${EXECUTABLE_OUTPUT_PATH}/${binary} ${PROJECT_SOURCE_DIR}/${TEST_SUBDIR}/Test/${name} ${rfile} ${rlevel} ${ARGN})
endif(IFEM_TEST_MEMCHECK)
set(VALGRIND "-v ${MEMCHECK_COMMAND}")
endif()
add_test("${test-name}" regtest.sh ${VALGRIND} -a ${EXECUTABLE_OUTPUT_PATH}/${binary} -r ${PROJECT_SOURCE_DIR}/${TEST_SUBDIR}/Test/${name} -s ${rlevel} ${ARGN})
endfunction()
function(IFEM_add_vtf_test name binary)