summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-02-12 13:41:43 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-02-12 13:41:43 (GMT)
commit6ad28abc14a8ced8ce10bf5bf25f74fea0344fcf (patch)
tree4dcbdb54b0bc19cb37525692fc02d513c12d9576
parent9d07161dd9b380449195e36a1d4805cc8ea424cb (diff)
downloadhdf5-6ad28abc14a8ced8ce10bf5bf25f74fea0344fcf.zip
hdf5-6ad28abc14a8ced8ce10bf5bf25f74fea0344fcf.tar.gz
hdf5-6ad28abc14a8ced8ce10bf5bf25f74fea0344fcf.tar.bz2
[svn-r23249] Correct typo in normal depends statement.
Add MEMORY_CHECK settings to match existing VALGRIND statements
-rw-r--r--CTestConfig.cmake2
-rw-r--r--tools/h5dump/CMakeLists.txt2
2 files changed, 3 insertions, 1 deletions
diff --git a/CTestConfig.cmake b/CTestConfig.cmake
index 8d00095..5d8f25c 100644
--- a/CTestConfig.cmake
+++ b/CTestConfig.cmake
@@ -20,6 +20,8 @@ SET (CTEST_DROP_SITE_CDASH TRUE)
SET (UPDATE_TYPE svn)
SET (VALGRIND_COMMAND "/usr/bin/valgrind")
SET (VALGRIND_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")
+SET (CTEST_MEMORYCHECK_COMMAND "/usr/bin/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")
SET (CTEST_TEST_TIMEOUT 3600 CACHE STRING
"Maximum time allowed before CTest will kill the test.")
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index 56f49ac..4d6e080 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -1616,7 +1616,7 @@ IF (BUILD_TESTING)
IF (NOT HDF5_ENABLE_USING_MEMCHECKER)
ADD_TEST (NAME H5DUMP-clear-out3 COMMAND ${CMAKE_COMMAND} -E remove ./testfiles/std/out3.h5)
- SET_TESTS_PROPERTIES (H5DUMP-h5import-out3 PROPERTIES DEPENDS H5DUMP-tbin3)
+ SET_TESTS_PROPERTIES (H5DUMP-clear-out3 PROPERTIES DEPENDS H5DUMP-tbin3)
ADD_TEST (NAME H5DUMP-h5import-out3 COMMAND h5import out3.bin -c out3.h5import -o out3.h5)
SET_TESTS_PROPERTIES (H5DUMP-h5import-out3 PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/std")
SET_TESTS_PROPERTIES (H5DUMP-h5import-out3 PROPERTIES DEPENDS H5DUMP-clear-out3)