diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-12-11 21:51:55 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-12-11 21:51:55 (GMT) |
| commit | 34ff52bd1a3c6eb4a737b92c7f36bdd0109e6ddc (patch) | |
| tree | 03774b89336b7a14b6494008c0dcd952f0aa0dd3 /config/cmake/scripts/CTestScript.cmake | |
| parent | 5d94490e38eae88c5180c6ce1b3f74d82f1dd600 (diff) | |
| parent | 6e7dcf170b39885f8aa4e7a35d1dc54f1489b375 (diff) | |
| download | hdf5-34ff52bd1a3c6eb4a737b92c7f36bdd0109e6ddc.zip hdf5-34ff52bd1a3c6eb4a737b92c7f36bdd0109e6ddc.tar.gz hdf5-34ff52bd1a3c6eb4a737b92c7f36bdd0109e6ddc.tar.bz2 | |
Merge pull request #2130 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '6e7dcf170b39885f8aa4e7a35d1dc54f1489b375':
Fix issues found with ONLY_SHARED_LIBS option
Diffstat (limited to 'config/cmake/scripts/CTestScript.cmake')
| -rw-r--r-- | config/cmake/scripts/CTestScript.cmake | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/config/cmake/scripts/CTestScript.cmake b/config/cmake/scripts/CTestScript.cmake index febe109..8425312 100644 --- a/config/cmake/scripts/CTestScript.cmake +++ b/config/cmake/scripts/CTestScript.cmake @@ -201,13 +201,18 @@ else () set (CTEST_CONFIGURE_ARCHITECTURE "") endif() if (LOCAL_MEMCHECK_TEST) - find_program (CTEST_MEMORYCHECK_COMMAND NAMES valgrind) + if(LOCAL_USE_VALGRIND) + set (CTEST_MEMORYCHECK_COMMAND_OPTIONS "-v --tool=memcheck --leak-check=full --track-fds=yes --num-callers=50 --show-reachable=yes --track-origins=yes --malloc-fill=0xff --free-fill=0xfe") + find_program(CTEST_MEMORYCHECK_COMMAND NAMES valgrind) + endif() set (CTEST_CONFIGURE_COMMAND "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/mccacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_ARCHITECTURE}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\"" ) else () if (LOCAL_COVERAGE_TEST) - find_program (CTEST_COVERAGE_COMMAND NAMES gcov) + if(LOCAL_USE_GCOV) + find_program (CTEST_COVERAGE_COMMAND NAMES gcov) + endif () endif () set (CTEST_CONFIGURE_COMMAND "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_ARCHITECTURE}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\"" |